diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-17 18:03:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-17 18:03:55 +0300 |
| commit | 0425b59de99afdf6e580243e5ac91c9c60d15f57 (patch) | |
| tree | e2d1164b2735fabd2fcc0d182301105f38b269c9 | |
| parent | a2d5c5474faf099788f24289e7d85c08057e4ac5 (diff) | |
| download | manaverse-0425b59de99afdf6e580243e5ac91c9c60d15f57.tar.gz manaverse-0425b59de99afdf6e580243e5ac91c9c60d15f57.tar.bz2 manaverse-0425b59de99afdf6e580243e5ac91c9c60d15f57.tar.xz manaverse-0425b59de99afdf6e580243e5ac91c9c60d15f57.zip | |
Remove shadow variable from shoplistbox.
| -rw-r--r-- | src/gui/widgets/shoplistbox.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/shoplistbox.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 84ed09dcc..0fcce799a 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -54,7 +54,6 @@ ShopListBox::ShopListBox(const Widget2 *const widget, ListBox(widget, listModel, "shoplistbox.xml"), mPlayerMoney(0), mShopItems(nullptr), - mBackgroundColor(getThemeColor(ThemeColorId::BACKGROUND)), mWarningColor(getThemeColor(ThemeColorId::SHOP_WARNING)), mType(type), mPriceCheck(true), @@ -63,6 +62,7 @@ ShopListBox::ShopListBox(const Widget2 *const widget, mRowHeight = getFont()->getHeight(); mHighlightColor = getThemeColor(ThemeColorId::HIGHLIGHT); mForegroundColor = getThemeColor(ThemeColorId::LISTBOX); + mBackgroundColor = getThemeColor(ThemeColorId::BACKGROUND); } ShopListBox::ShopListBox(const Widget2 *const widget, @@ -72,7 +72,6 @@ ShopListBox::ShopListBox(const Widget2 *const widget, ListBox(widget, listModel, "shoplistbox.xml"), mPlayerMoney(0), mShopItems(shopListModel), - mBackgroundColor(getThemeColor(ThemeColorId::BACKGROUND)), mWarningColor(getThemeColor(ThemeColorId::SHOP_WARNING)), mType(type), mPriceCheck(true), @@ -81,6 +80,7 @@ ShopListBox::ShopListBox(const Widget2 *const widget, mRowHeight = std::max(getFont()->getHeight(), ITEM_ICON_SIZE); mHighlightColor = getThemeColor(ThemeColorId::HIGHLIGHT); mForegroundColor = getThemeColor(ThemeColorId::LISTBOX); + mBackgroundColor = getThemeColor(ThemeColorId::BACKGROUND); } void ShopListBox::setPlayersMoney(const int money) diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index a6462a56b..2e79d16bb 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -103,7 +103,6 @@ class ShopListBox final : public ListBox */ ShopItems *mShopItems; - Color mBackgroundColor; Color mWarningColor; ShopListBoxTypeT mType; |