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/virtshortcutcontainer.cpp | |
| parent | 35d796b927447760772d2720a221e21fdf9fd10e (diff) | |
| download | manaplus-52039744fa2e5e116548e5236cd8ba5f5d81702a.tar.gz manaplus-52039744fa2e5e116548e5236cd8ba5f5d81702a.tar.bz2 manaplus-52039744fa2e5e116548e5236cd8ba5f5d81702a.tar.xz manaplus-52039744fa2e5e116548e5236cd8ba5f5d81702a.zip | |
Remove default parameters from widget2.
Diffstat (limited to 'src/gui/widgets/virtshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/virtshortcutcontainer.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp index 7d333bdbb..f6172595c 100644 --- a/src/gui/widgets/virtshortcutcontainer.cpp +++ b/src/gui/widgets/virtshortcutcontainer.cpp @@ -46,10 +46,11 @@ VirtShortcutContainer::VirtShortcutContainer(Widget2 *const widget, ShortcutBase *const shortcut) : ShortcutContainer(widget), mItemClicked(false), - 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)), mShortcut(shortcut) { if (mShortcut != nullptr) @@ -65,10 +66,11 @@ VirtShortcutContainer::~VirtShortcutContainer() void VirtShortcutContainer::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); + 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); } void VirtShortcutContainer::draw(Graphics *const graphics) |