diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-24 22:36:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-24 22:36:00 +0300 |
| commit | 52039744fa2e5e116548e5236cd8ba5f5d81702a (patch) | |
| tree | d367514cfc2a00c0b1f181dbfb5a8c3b0ca5785d /src/gui/widgets/itemshortcutcontainer.cpp | |
| parent | 35d796b927447760772d2720a221e21fdf9fd10e (diff) | |
| download | mv-52039744fa2e5e116548e5236cd8ba5f5d81702a.tar.gz mv-52039744fa2e5e116548e5236cd8ba5f5d81702a.tar.bz2 mv-52039744fa2e5e116548e5236cd8ba5f5d81702a.tar.xz mv-52039744fa2e5e116548e5236cd8ba5f5d81702a.zip | |
Remove default parameters from widget2.
Diffstat (limited to 'src/gui/widgets/itemshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
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) |