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/window.cpp | 2 |
11 files changed, 11 insertions, 1 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml index 9ee0d3c58..e0f2fc169 100644 --- a/data/graphics/gui/colors.xml +++ b/data/graphics/gui/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#000000" /> <color id="TEXTBOX" color="#000000" /> <color id="TEXTFIELD" color="#000000" /> + <color id="WINDOW" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#f48055" /> <color id="GUILD_CHAT_TAB" color="#f48055" /> diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml index 69b6a5aa8..03d726e5d 100644 --- a/data/themes/blacknblack/colors.xml +++ b/data/themes/blacknblack/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#13f00d" /> <color id="TEXTBOX" color="#ffffff" /> <color id="TEXTFIELD" color="#ffffff" /> + <color id="WINDOW" color="#ffffff" /> <color id="PARTY_CHAT_TAB" color="#ff00d8" /> <color id="PARTY_SOCIAL_TAB" color="#ff00d8" /> <color id="GUILD_CHAT_TAB" color="#ff00d8" /> diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml index 9848c170e..30fe6ccac 100644 --- a/data/themes/blackwood/colors.xml +++ b/data/themes/blackwood/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#000000" /> <color id="TEXTBOX" color="#000000" /> <color id="TEXTFIELD" color="#000000" /> + <color id="WINDOW" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#ff00d8" /> <color id="PARTY_SOCIAL_TAB" color="#ff00d8" /> <color id="GUILD_CHAT_TAB" color="#ff00d8" /> diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml index 49f33e1ce..6f31137f1 100644 --- a/data/themes/enchilado/colors.xml +++ b/data/themes/enchilado/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#000000" /> <color id="TEXTBOX" color="#000000" /> <color id="TEXTFIELD" color="#000000" /> + <color id="WINDOW" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#f48055" /> <color id="GUILD_CHAT_TAB" color="#f48055" /> diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml index 29b08fe8f..5c2ff83bc 100644 --- a/data/themes/mana/colors.xml +++ b/data/themes/mana/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#000000" /> <color id="TEXTBOX" color="#000000" /> <color id="TEXTFIELD" color="#000000" /> + <color id="WINDOW" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#ff00d8" /> <color id="GUILD_CHAT_TAB" color="#ff00d8" /> diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml index 7ce80b0b1..5750d9131 100644 --- a/data/themes/pink/colors.xml +++ b/data/themes/pink/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#FF32FF" /> <color id="TEXTBOX" color="#FF00FF" /> <color id="TEXTFIELD" color="#FF00FF" /> + <color id="WINDOW" color="#FF00FF" /> <color id="PARTY_CHAT_TAB" color="#f48055" /> <color id="PARTY_SOCIAL_TAB" color="#f48055" /> <color id="GUILD_CHAT_TAB" color="#f48055" /> diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml index 52300da0d..14ebc191d 100644 --- a/data/themes/unity/colors.xml +++ b/data/themes/unity/colors.xml @@ -13,6 +13,7 @@ <color id="TAB" color="#F0F0F0" /> <color id="TEXTBOX" color="#FE9750" /> <color id="TEXTFIELD" color="#FE9750" /> + <color id="WINDOW" color="#FE9750" /> <color id="PARTY_CHAT_TAB" color="#E0E0E0" /> <color id="PARTY_SOCIAL_TAB" color="#E0E0E0" /> <color id="GUILD_CHAT_TAB" color="#E0E0E0" /> diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml index 7dce79f4a..14d28b2de 100644 --- a/data/themes/wood/colors.xml +++ b/data/themes/wood/colors.xml @@ -14,6 +14,7 @@ <color id="TAB" color="#000000" /> <color id="TEXTBOX" color="#000000" /> <color id="TEXTFIELD" color="#000000" /> + <color id="WINDOW" color="#000000" /> <color id="PARTY_CHAT_TAB" color="#c04000" /> <color id="PARTY_SOCIAL_TAB" color="#c04000" /> <color id="GUILD_CHAT_TAB" color="#c04000" /> diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 9aa920bc7..93dfd17c3 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -670,6 +670,7 @@ static int readColorType(const std::string &type) "TAB", "TEXTBOX", "TEXTFIELD", + "WINDOW", "PARTY_CHAT_TAB", "PARTY_SOCIAL_TAB", "GUILD_CHAT_TAB", diff --git a/src/gui/theme.h b/src/gui/theme.h index 2c9588b6c..259da1a66 100644 --- a/src/gui/theme.h +++ b/src/gui/theme.h @@ -178,6 +178,7 @@ class Theme : public Palette, public ConfigListener TAB, TEXTBOX, TEXTFIELD, + WINDOW, PARTY_CHAT_TAB, PARTY_SOCIAL_TAB, GUILD_CHAT_TAB, diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 2350ed958..355f12bee 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -124,7 +124,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent, addWidgetListener(this); mCaptionFont = getFont(); - setForegroundColor(Theme::getThemeColor(Theme::TEXT)); + setForegroundColor(Theme::getThemeColor(Theme::WINDOW)); } Window::~Window() |