From 52039744fa2e5e116548e5236cd8ba5f5d81702a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 Dec 2017 22:36:00 +0300 Subject: Remove default parameters from widget2. --- src/gui/widgets/itemshortcutcontainer.cpp | 22 ++++++++++++---------- 1 file changed, 12 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 9f667caba..adfa24527 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -58,10 +58,11 @@ ItemShortcutContainer::ItemShortcutContainer(Widget2 *const widget, ShortcutContainer(widget), mItemClicked(false), mNumber(number), - mEquipedColor(getThemeColor(ThemeColorId::ITEM_EQUIPPED)), - mEquipedColor2(getThemeColor(ThemeColorId::ITEM_EQUIPPED_OUTLINE)), - mUnEquipedColor(getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED)), - mUnEquipedColor2(getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED_OUTLINE)) + mEquipedColor(getThemeColor(ThemeColorId::ITEM_EQUIPPED, 255U)), + mEquipedColor2(getThemeColor(ThemeColorId::ITEM_EQUIPPED_OUTLINE, 255U)), + mUnEquipedColor(getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED, 255U)), + mUnEquipedColor2(getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED_OUTLINE, + 255U)) { mMaxItems = ItemShortcut::getItemCount(); } @@ -73,12 +74,13 @@ ItemShortcutContainer::~ItemShortcutContainer() void ItemShortcutContainer::setWidget2(const Widget2 *const widget) { Widget2::setWidget2(widget); - 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); + mEquipedColor = getThemeColor(ThemeColorId::ITEM_EQUIPPED, 255U); + mEquipedColor2 = getThemeColor(ThemeColorId::ITEM_EQUIPPED_OUTLINE, 255U); + mUnEquipedColor = getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED, 255U); + mUnEquipedColor2 = getThemeColor(ThemeColorId::ITEM_NOT_EQUIPPED_OUTLINE, + 255U); + mForegroundColor = getThemeColor(ThemeColorId::TEXT, 255U); + mForegroundColor2 = getThemeColor(ThemeColorId::TEXT_OUTLINE, 255U); } void ItemShortcutContainer::draw(Graphics *const graphics) -- cgit v1.2.3-70-g09d2