diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-14 18:47:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-14 18:47:16 +0300 |
| commit | d16122cae03202761d75384388f52ca084f91ea4 (patch) | |
| tree | 921af804051de49732426182b877580a2cba90b6 /src/gui/widgets | |
| parent | 596436645bef0b41f448e6d7b501a1fc2c5b1fc6 (diff) | |
| download | manaverse-d16122cae03202761d75384388f52ca084f91ea4.tar.gz manaverse-d16122cae03202761d75384388f52ca084f91ea4.tar.bz2 manaverse-d16122cae03202761d75384388f52ca084f91ea4.tar.xz manaverse-d16122cae03202761d75384388f52ca084f91ea4.zip | |
Fix shadow variables in PopupMenu and Desktop.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/desktop.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/desktop.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 46bb3cba3..4aeea03b5 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -55,10 +55,11 @@ Desktop::Desktop(const Widget2 *const widget) : mVersionLabel(new BrowserBox(this, BrowserBoxMode::AUTO_WRAP, Opaque_false, "browserbox.xml")), mSkin(nullptr), - mBackgroundColor(getThemeColor(ThemeColorId::BACKGROUND, 128)), mBackgroundGrayColor(getThemeColor(ThemeColorId::BACKGROUND_GRAY)), mShowBackground(true) { + mBackgroundColor = getThemeColor(ThemeColorId::BACKGROUND, 128); + addWidgetListener(this); Wallpaper::loadWallpapers(); diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index 44f312c21..0a7ecf82d 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -79,7 +79,6 @@ class Desktop final : public Container, Image *mWallpaper; BrowserBox *mVersionLabel; Skin *mSkin; - Color mBackgroundColor; Color mBackgroundGrayColor; bool mShowBackground; }; |