From 07121956f882dce22235868a25e0c2df96fb828a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2015 15:04:01 +0300 Subject: Move theme colors enum into separate file. --- src/gui/widgets/shoplistbox.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/widgets/shoplistbox.cpp') diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index a5e5937ef..788a493a9 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -47,14 +47,14 @@ ShopListBox::ShopListBox(const Widget2 *const widget, ListBox(widget, listModel, "shoplistbox.xml"), mPlayerMoney(0), mShopItems(nullptr), - mBackgroundColor(getThemeColor(Theme::BACKGROUND)), - mWarningColor(getThemeColor(Theme::SHOP_WARNING)), + mBackgroundColor(getThemeColor(ThemeColorId::BACKGROUND)), + mWarningColor(getThemeColor(ThemeColorId::SHOP_WARNING)), mPriceCheck(true), mProtectItems(false) { mRowHeight = getFont()->getHeight(); - mHighlightColor = getThemeColor(Theme::HIGHLIGHT); - mForegroundColor = getThemeColor(Theme::LISTBOX); + mHighlightColor = getThemeColor(ThemeColorId::HIGHLIGHT); + mForegroundColor = getThemeColor(ThemeColorId::LISTBOX); } ShopListBox::ShopListBox(const Widget2 *const widget, @@ -63,14 +63,14 @@ ShopListBox::ShopListBox(const Widget2 *const widget, ListBox(widget, listModel, "shoplistbox.xml"), mPlayerMoney(0), mShopItems(shopListModel), - mBackgroundColor(getThemeColor(Theme::BACKGROUND)), - mWarningColor(getThemeColor(Theme::SHOP_WARNING)), + mBackgroundColor(getThemeColor(ThemeColorId::BACKGROUND)), + mWarningColor(getThemeColor(ThemeColorId::SHOP_WARNING)), mPriceCheck(true), mProtectItems(false) { mRowHeight = std::max(getFont()->getHeight(), ITEM_ICON_SIZE); - mHighlightColor = getThemeColor(Theme::HIGHLIGHT); - mForegroundColor = getThemeColor(Theme::LISTBOX); + mHighlightColor = getThemeColor(ThemeColorId::HIGHLIGHT); + mForegroundColor = getThemeColor(ThemeColorId::LISTBOX); } void ShopListBox::setPlayersMoney(const int money) -- cgit v1.2.3-70-g09d2