diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-20 16:38:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-20 16:38:15 +0300 |
| commit | 747dc30f256606e28fd932a9626da7c328114036 (patch) | |
| tree | 1b3e7e70ba439d14d4936660d44c95c27816a11b /src/gui/widgets/popup.cpp | |
| parent | cef2952156ab09371ed04beec00d0f1e8615ada9 (diff) | |
| download | manaplus-747dc30f256606e28fd932a9626da7c328114036.tar.gz manaplus-747dc30f256606e28fd932a9626da7c328114036.tar.bz2 manaplus-747dc30f256606e28fd932a9626da7c328114036.tar.xz manaplus-747dc30f256606e28fd932a9626da7c328114036.zip | |
fix style in gui directory.
Diffstat (limited to 'src/gui/widgets/popup.cpp')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 20b4c3ca1..c2e39fdb2 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -38,6 +38,8 @@ Popup::Popup(const std::string &name, Container(nullptr), gcn::MouseListener(), gcn::WidgetListener(), + mPadding(3), + mSkin(nullptr), mPopupName(name), mMinWidth(100), mMinHeight(40), @@ -53,8 +55,6 @@ Popup::Popup(const std::string &name, addWidgetListener(this); - setPadding(3); - if (skin == "") skin = "popup.xml"; @@ -68,10 +68,6 @@ Popup::Popup(const std::string &name, setPalette(mSkin->getOption("palette")); } } - else - { - mSkin = nullptr; - } // Add this window to the window container windowContainer->add(this); |