diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-11 04:24:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-11 04:24:30 +0300 |
| commit | db4361d9f7652104e818cf9a2a0f326e1c607fb8 (patch) | |
| tree | 57587f5fa82826aa428cbf639f1f942952785c0c /src/gui/widgets | |
| parent | 632c1797013d8b0a987ab68341b50354afdb1f9d (diff) | |
| download | manaplus-db4361d9f7652104e818cf9a2a0f326e1c607fb8.tar.gz manaplus-db4361d9f7652104e818cf9a2a0f326e1c607fb8.tar.bz2 manaplus-db4361d9f7652104e818cf9a2a0f326e1c607fb8.tar.xz manaplus-db4361d9f7652104e818cf9a2a0f326e1c607fb8.zip | |
Add own xml configuration for missing windows.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 22 | ||||
| -rw-r--r-- | src/gui/widgets/popup.h | 3 |
2 files changed, 20 insertions, 5 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index ebfdbe303..ac282b088 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -40,7 +40,7 @@ #include "debug.h" -Popup::Popup(const std::string &name, const std::string &skin): +Popup::Popup(const std::string &name, std::string skin): mPopupName(name), mMinWidth(100), mMinHeight(40), @@ -58,8 +58,20 @@ Popup::Popup(const std::string &name, const std::string &skin): setPadding(3); + if (skin == "") + skin = "popup.xml"; + // Loads the skin - mSkin = Theme::instance()->load(skin); + if (Theme::instance()) + { + mSkin = Theme::instance()->load(skin); + if (mSkin) + setPadding(mSkin->getPadding()); + } + else + { + mSkin = 0; + } // Add this window to the window container windowContainer->add(this); @@ -76,7 +88,11 @@ Popup::~Popup() mVertexes = 0; if (mSkin) - mSkin->instances--; + { + if (Theme::instance()) + Theme::instance()->unload(mSkin); + mSkin = 0; + } } void Popup::setWindowContainer(WindowContainer *wc) diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 0ac50f69e..9d4343ba3 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -66,8 +66,7 @@ class Popup : public Container, public gcn::MouseListener, * debugging purposes. * @param skin The location where the Popup's skin XML can be found. */ - Popup(const std::string &name = "", - const std::string &skin = "window.xml"); + Popup(const std::string &name = "", std::string skin = ""); /** * Destructor. Deletes all the added widgets. |