summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/graphics/gui/colors.xml1
-rw-r--r--data/themes/blacknblack/colors.xml1
-rw-r--r--data/themes/blackwood/colors.xml1
-rw-r--r--data/themes/enchilado/colors.xml1
-rw-r--r--data/themes/mana/colors.xml1
-rw-r--r--data/themes/pink/colors.xml1
-rw-r--r--data/themes/unity/colors.xml1
-rw-r--r--data/themes/wood/colors.xml1
-rw-r--r--src/gui/theme.cpp1
-rw-r--r--src/gui/theme.h1
-rw-r--r--src/gui/widgets/shoplistbox.cpp4
-rw-r--r--src/gui/widgets/textbox.cpp2
12 files changed, 13 insertions, 3 deletions
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 5314e891c..6d11adf56 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#000000" />
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
+ <color id="TEXTBOX" 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 783c6b92a..5bfe0f103 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#ffffff" />
<color id="RADIOBUTTON" color="#ffffff" />
<color id="TAB" color="#13f00d" />
+ <color id="TEXTBOX" 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 a44187f9d..f57883f8c 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#000000" />
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
+ <color id="TEXTBOX" 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 c1e4fac69..a98ad1068 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#000000" />
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
+ <color id="TEXTBOX" 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 67dd73975..b0668f1ff 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#000000" />
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
+ <color id="TEXTBOX" 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 e3ec74a47..301eacf2b 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#FF00FF" />
<color id="RADIOBUTTON" color="#FF00FF" />
<color id="TAB" color="#FF32FF" />
+ <color id="TEXTBOX" 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 d9d66eb5d..717dffc13 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -11,6 +11,7 @@
<color id="LISTBOX" color="#FE9750" />
<color id="RADIOBUTTON" color="#FE9750" />
<color id="TAB" color="#F0F0F0" />
+ <color id="TEXTBOX" 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 63aa43a0a..80d619c29 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -12,6 +12,7 @@
<color id="LISTBOX" color="#000000" />
<color id="RADIOBUTTON" color="#000000" />
<color id="TAB" color="#000000" />
+ <color id="TEXTBOX" 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 ce439903b..cc9116cdd 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -668,6 +668,7 @@ static int readColorType(const std::string &type)
"LISTBOX",
"RADIOBUTTON",
"TAB",
+ "TEXTBOX",
"PARTY_CHAT_TAB",
"PARTY_SOCIAL_TAB",
"GUILD_CHAT_TAB",
diff --git a/src/gui/theme.h b/src/gui/theme.h
index dcafd75e6..9c89afc84 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -176,6 +176,7 @@ class Theme : public Palette, public ConfigListener
LISTBOX,
RADIOBUTTON,
TAB,
+ TEXTBOX,
PARTY_CHAT_TAB,
PARTY_SOCIAL_TAB,
GUILD_CHAT_TAB,
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 45b385255..2ee60d56f 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -55,7 +55,7 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel):
mBackgroundColor(Theme::getThemeColor(Theme::BACKGROUND)),
mWarningColor(Theme::getThemeColor(Theme::SHOP_WARNING))
{
- setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+ setForegroundColor(Theme::getThemeColor(Theme::LISTBOX));
}
ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
@@ -69,7 +69,7 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
mBackgroundColor(Theme::getThemeColor(Theme::BACKGROUND)),
mWarningColor(Theme::getThemeColor(Theme::SHOP_WARNING))
{
- setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+ setForegroundColor(Theme::getThemeColor(Theme::LISTBOX));
}
void ShopListBox::init()
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index 048051bb9..06a24c68f 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -34,7 +34,7 @@
#include "debug.h"
TextBox::TextBox() :
- mTextColor(&Theme::getThemeColor(Theme::TEXT))
+ mTextColor(&Theme::getThemeColor(Theme::TEXTBOX))
{
setOpaque(false);
setFrameSize(0);
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-12 23:59:31 +0000