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/itemshortcutcontainer.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/gui/widgets/itemshortcutcontainer.cpp') diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 6a2aa4c93..15af7c286 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -53,10 +53,10 @@ ItemShortcutContainer::ItemShortcutContainer(Widget2 *const widget, ShortcutContainer(widget), mItemClicked(false), mNumber(number), - mEquipedColor(getThemeColor(Theme::ITEM_EQUIPPED)), - mEquipedColor2(getThemeColor(Theme::ITEM_EQUIPPED_OUTLINE)), - mUnEquipedColor(getThemeColor(Theme::ITEM_NOT_EQUIPPED)), - mUnEquipedColor2(getThemeColor(Theme::ITEM_NOT_EQUIPPED_OUTLINE)) + mEquipedColor(getThemeColor(ThemeColorId::ITEM_EQUIPPED)), + mEquipedColor2(getThemeColor(ThemeColorId::ITEM_EQUIPPED_OUTLINE)), + mUnEquipedColor(getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED)), + mUnEquipedColor2(getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED_OUTLINE)) { if (itemShortcut[mNumber]) mMaxItems = itemShortcut[mNumber]->getItemCount(); @@ -71,12 +71,12 @@ ItemShortcutContainer::~ItemShortcutContainer() void ItemShortcutContainer::setWidget2(const Widget2 *const widget) { Widget2::setWidget2(widget); - mEquipedColor = getThemeColor(Theme::ITEM_EQUIPPED); - mEquipedColor2 = getThemeColor(Theme::ITEM_EQUIPPED_OUTLINE); - mUnEquipedColor = getThemeColor(Theme::ITEM_NOT_EQUIPPED); - mUnEquipedColor2 = getThemeColor(Theme::ITEM_NOT_EQUIPPED_OUTLINE); - mForegroundColor = getThemeColor(Theme::TEXT); - mForegroundColor2 = getThemeColor(Theme::TEXT_OUTLINE); + mEquipedColor = getThemeColor(ThemeColorId::ITEM_EQUIPPED); + mEquipedColor2 = getThemeColor(ThemeColorId::ITEM_EQUIPPED_OUTLINE); + mUnEquipedColor = getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED); + mUnEquipedColor2 = getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED_OUTLINE); + mForegroundColor = getThemeColor(ThemeColorId::TEXT); + mForegroundColor2 = getThemeColor(ThemeColorId::TEXT_OUTLINE); } void ItemShortcutContainer::draw(Graphics *graphics) -- cgit v1.2.3-70-g09d2