diff options
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r-- | src/gui/widgets/tabs/chat/chattab.h | 12 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_relations.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialguildtab.h | 13 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialguildtab2.h | 12 | ||||
-rw-r--r-- | src/gui/widgets/tabs/socialpartytab.h | 13 | ||||
-rw-r--r-- | src/gui/widgets/tabs/tab.cpp | 20 |
6 files changed, 37 insertions, 35 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h index 6e51ca172..aeefe43db 100644 --- a/src/gui/widgets/tabs/chat/chattab.h +++ b/src/gui/widgets/tabs/chat/chattab.h @@ -48,12 +48,12 @@ class ScrollArea; } #define setTabColors(name) \ - setTabColor(&getThemeColor(name), \ - &getThemeColor(name##_OUTLINE)); \ - setHighlightedTabColor(&getThemeColor(name##_HIGHLIGHTED), \ - &getThemeColor(name##_HIGHLIGHTED_OUTLINE)); \ - setSelectedTabColor(&getThemeColor(name##_SELECTED), \ - &getThemeColor(name##_SELECTED_OUTLINE)) + setTabColor(&getThemeColor(name, 255U), \ + &getThemeColor(name##_OUTLINE, 255U)); \ + setHighlightedTabColor(&getThemeColor(name##_HIGHLIGHTED, 255U), \ + &getThemeColor(name##_HIGHLIGHTED_OUTLINE, 255U)); \ + setSelectedTabColor(&getThemeColor(name##_SELECTED, 255U), \ + &getThemeColor(name##_SELECTED_OUTLINE, 255U)) /** * A tab for the chat window. This is special to ease chat handling. diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp index 095277a75..d81774694 100644 --- a/src/gui/widgets/tabs/setup_relations.cpp +++ b/src/gui/widgets/tabs/setup_relations.cpp @@ -89,7 +89,7 @@ Setup_Relations::Setup_Relations(const Widget2 *const widget) : mPlayerTableTitleModel->fixColumnWidth(RELATION_CHOICE_COLUMN, RELATION_CHOICE_COLUMN_WIDTH); mPlayerTitleTable->setBackgroundColor(getThemeColor( - ThemeColorId::TABLE_BACKGROUND)); + ThemeColorId::TABLE_BACKGROUND, 255U)); mPlayerTitleTable->setSelectableGui(false); for (int i = 0; i < COLUMNS_NR; i++) diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index 433823ff4..a42ad1dad 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -49,15 +49,16 @@ class SocialGuildTab final : public SocialTab, // TRANSLATORS: tab in social window setCaption(_("Guild")); - setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB), - &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE)); + setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB, 255U), + &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE, 255U)); setHighlightedTabColor(&getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE)); + ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED, 255U), + &getThemeColor( + ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE, 255U)); setSelectedTabColor(&getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_SELECTED), + ThemeColorId::GUILD_SOCIAL_TAB_SELECTED, 255U), &getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE)); + ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE, 255U)); createControls(guild, showBackground); mMenuAction = "guild"; diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index ff8544232..c0dc123a4 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -48,16 +48,16 @@ class SocialGuildTab2 final : public SocialTab, // TRANSLATORS: tab in social window setCaption(_("Guild")); - setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB), - &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE)); + setTabColor(&getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB, 255U), + &getThemeColor(ThemeColorId::GUILD_SOCIAL_TAB_OUTLINE, 255U)); setHighlightedTabColor(&getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED), + ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED, 255U), &getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE)); + ThemeColorId::GUILD_SOCIAL_TAB_HIGHLIGHTED_OUTLINE, 255U)); setSelectedTabColor(&getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_SELECTED), + ThemeColorId::GUILD_SOCIAL_TAB_SELECTED, 255U), &getThemeColor( - ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE)); + ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE, 255U)); createControls(guild, showBackground); mMenuAction = "guild"; diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index f151f9e62..17fcfd3f1 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -51,15 +51,16 @@ class SocialPartyTab final : public SocialTab, // TRANSLATORS: tab in social window setCaption(_("Party")); - setTabColor(&getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB), - &getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB_OUTLINE)); + setTabColor(&getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB, 255U), + &getThemeColor(ThemeColorId::PARTY_SOCIAL_TAB_OUTLINE, 255U)); setHighlightedTabColor(&getThemeColor( - ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED), &getThemeColor( - ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE)); + ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED, 255U), + &getThemeColor( + ThemeColorId::PARTY_SOCIAL_TAB_HIGHLIGHTED_OUTLINE, 255U)); setSelectedTabColor(&getThemeColor( - ThemeColorId::PARTY_SOCIAL_TAB_SELECTED), + ThemeColorId::PARTY_SOCIAL_TAB_SELECTED, 255U), &getThemeColor( - ThemeColorId::PARTY_SOCIAL_TAB_SELECTED_OUTLINE)); + ThemeColorId::PARTY_SOCIAL_TAB_SELECTED_OUTLINE, 255U)); createControls(party, showBackground); mMenuAction = "party"; diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index 36c2a3f40..88fe5d54f 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -105,19 +105,19 @@ Tab::Tab(const Widget2 *const widget) : WidgetListener(), mLabel(new Label(this)), mTabbedArea(nullptr), - mTabColor(&getThemeColor(ThemeColorId::TAB)), - mTabOutlineColor(&getThemeColor(ThemeColorId::TAB_OUTLINE)), - mTabHighlightedColor(&getThemeColor(ThemeColorId::TAB_HIGHLIGHTED)), + mTabColor(&getThemeColor(ThemeColorId::TAB, 255U)), + mTabOutlineColor(&getThemeColor(ThemeColorId::TAB_OUTLINE, 255U)), + mTabHighlightedColor(&getThemeColor(ThemeColorId::TAB_HIGHLIGHTED, 255U)), mTabHighlightedOutlineColor(&getThemeColor( - ThemeColorId::TAB_HIGHLIGHTED_OUTLINE)), - mTabSelectedColor(&getThemeColor(ThemeColorId::TAB_SELECTED)), + ThemeColorId::TAB_HIGHLIGHTED_OUTLINE, 255U)), + mTabSelectedColor(&getThemeColor(ThemeColorId::TAB_SELECTED, 255U)), mTabSelectedOutlineColor(&getThemeColor( - ThemeColorId::TAB_SELECTED_OUTLINE)), - mFlashColor(&getThemeColor(ThemeColorId::TAB_FLASH)), - mFlashOutlineColor(&getThemeColor(ThemeColorId::TAB_FLASH_OUTLINE)), - mPlayerFlashColor(&getThemeColor(ThemeColorId::TAB_PLAYER_FLASH)), + ThemeColorId::TAB_SELECTED_OUTLINE, 255U)), + mFlashColor(&getThemeColor(ThemeColorId::TAB_FLASH, 255U)), + mFlashOutlineColor(&getThemeColor(ThemeColorId::TAB_FLASH_OUTLINE, 255U)), + mPlayerFlashColor(&getThemeColor(ThemeColorId::TAB_PLAYER_FLASH, 255U)), mPlayerFlashOutlineColor(&getThemeColor( - ThemeColorId::TAB_PLAYER_FLASH_OUTLINE)), + ThemeColorId::TAB_PLAYER_FLASH_OUTLINE, 255U)), mFlash(0), mVertexes(new ImageCollection), mImage(nullptr), |