diff options
| -rw-r--r-- | data/graphics/gui/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/blacknblack/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/blackwood/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/enchilado/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/mana/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/pink/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/unity/colors.xml | 1 | ||||
| -rw-r--r-- | data/themes/wood/colors.xml | 1 | ||||
| -rw-r--r-- | src/gui/theme.cpp | 1 | ||||
| -rw-r--r-- | src/gui/theme.h | 1 | ||||
| -rw-r--r-- | src/gui/widgets/dropdown.cpp | 3 |
11 files changed, 12 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index a2a6ad514..2bce2d159 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#000000" /> <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> + <color id="DROPDOWN" color="#000000" /> <color id="TAB" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#f48055" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index a730f20a3..b857cff7a 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#ffffff" /> <color id="BUTTON_DISABLED" color="#777777" /> <color id="CHECKBOX" color="#ffffff" /> + <color id="DROPDOWN" color="#ffffff" /> <color id="TAB" color="#13f00d" /> <color id="PARTY_CHAT_TAB" color="#ff00d8" /> <color id="PARTY_SOCIAL_TAB" color="#ff00d8" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 165bbc7d5..41ec10cff 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#000000" /> <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> + <color id="DROPDOWN" color="#000000" /> <color id="TAB" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#ff00d8" /> <color id="PARTY_SOCIAL_TAB" color="#ff00d8" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 35d63d9d4..452d3aac4 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#000000" /> <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> + <color id="DROPDOWN" color="#000000" /> <color id="TAB" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#f48055" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 7b9d75b38..cbf28baa5 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#000000" /> <color id="BUTTON_DISABLED" color="#333333" /> <color id="CHECKBOX" color="#000000" /> + <color id="DROPDOWN" color="#000000" /> <color id="TAB" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#ff00d8" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index f00c6a9fd..210b7b272 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#FF00FF" /> <color id="BUTTON_DISABLED" color="#FF00FF" /> <color id="CHECKBOX" color="#FF00FF" /> + <color id="DROPDOWN" color="#FF00FF" /> <color id="TAB" color="#FF32FF" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#f48055" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index b7c983d93..7cd475a13 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -6,6 +6,7 @@ <color id="BUTTON" color="#FE9750" /> <color id="BUTTON_DISABLED" color="#FC6400" /> <color id="CHECKBOX" color="#FE9750" /> + <color id="DROPDOWN" color="#FE9750" /> <color id="TAB" color="#F0F0F0" /> <color id="PARTY_CHAT_TAB" color="#E0E0E0" /> <color id="PARTY_SOCIAL_TAB" color="#E0E0E0" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index e7670aba8..ff4608596 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -7,6 +7,7 @@ <color id="BUTTON" color="#000000" /> <color id="BUTTON_DISABLED" color="#cccccc" /> <color id="CHECKBOX" color="#000000" /> + <color id="DROPDOWN" color="#000000" /> <color id="TAB" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#c04000" /> <color id="PARTY_SOCIAL_TAB" color="#c04000" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 723730e2d..440c4ccf9 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -663,6 +663,7 @@ static int readColorType(const std::string &type) "BUTTON", "BUTTON_DISABLED", "CHECKBOX", + "DROPDOWN", "TAB", "PARTY_CHAT_TAB", "PARTY_SOCIAL_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index 15628d9d3..5e478a433 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -171,6 +171,7 @@ class Theme : public Palette, public ConfigListener BUTTON, BUTTON_DISABLED, CHECKBOX, + DROPDOWN, TAB, PARTY_CHAT_TAB, PARTY_SOCIAL_TAB, diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index d42b60799..3012c5553 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -106,7 +106,8 @@ DropDown::DropDown(gcn::ListModel *listModel, gcn::ActionListener* listener, instances++; - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + mListBox->setForegroundColor(Theme::getThemeColor(Theme::DROPDOWN)); + setForegroundColor(Theme::getThemeColor(Theme::DROPDOWN)); if (!eventId.empty()) setActionEventId(eventId); |