diff options
| -rw-r--r-- | data/graphics/gui/golden-delicious/theme.xml | 6 | ||||
| -rw-r--r-- | src/gui/buyselldialog.cpp | 11 | ||||
| -rw-r--r-- | src/gui/widgets/shoplistbox.cpp | 3 |
3 files changed, 7 insertions, 13 deletions
diff --git a/data/graphics/gui/golden-delicious/theme.xml b/data/graphics/gui/golden-delicious/theme.xml index 58809a65..f0ef48ad 100644 --- a/data/graphics/gui/golden-delicious/theme.xml +++ b/data/graphics/gui/golden-delicious/theme.xml @@ -12,8 +12,8 @@ <color id="LISTBOX" color="#e8d8aa" /> <!-- WIP: next colors may still need tweak --> <color id="CHANNEL_CHAT_TAB" color="#efd7a7" outlineColor="#473005" /> - <color id="BACKGROUND" color="#ffffff" /> - <color id="BACKGROUND_GRAY" color="#404040" /> + <color id="BACKGROUND" color="#5f5f5f" /> + <color id="BACKGROUND_GRAY" color="#161514" /> <color id="DROPDOWN_SHADOW" color="#c0c0c0" /> <color id="HIGHLIGHT" color="#ebc873" /> <color id="HIGHLIGHT_TEXT" color="#000000" /> @@ -25,7 +25,7 @@ <color id="WHISPER_TAB_OFFLINE" color="#444444" outlineColor="#000000" /> <color id="WHISPER_TAB_OFFLINE_HIGHLIGHTED" color="#fffbed" outlineColor="#000000" /> <color id="WHISPER_TAB_OFFLINE_SELECTED" color="#444444" outlineColor="#000000" /> - <color id="SHOP_WARNING" color="#e07a7a" /> + <color id="SHOP_WARNING" color="#701111" /> <color id="ITEM_EQUIPPED" color="#f8e8cf" /> <!-- Fixed --> <color id="CHAT" color="#f1d9a9" /> <color id="GM" color="#fec4ff" /> diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index be49ba58..c555cf01 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -23,8 +23,6 @@ #include "playerinfo.h" -#include "gui/setup.h" - #include "gui/widgets/button.h" #include "net/net.h" @@ -109,11 +107,6 @@ void BuySellDialog::action(const gcn::ActionEvent &event) void BuySellDialog::closeAll() { - auto it = instances.begin(); - auto it_end = instances.end(); - - for (; it != it_end; it++) - { - (*it)->close(); - } + for (auto &instance : instances) + instance->close(); } diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index d745d74d..afcb97b4 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -103,7 +103,8 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics) gcn::Color blend = warningColor; blend.r = (blend.r + highlightColor.r) / 2; blend.g = (blend.g + highlightColor.g) / 2; - blend.b = (blend.g + highlightColor.b) / 2; + blend.b = (blend.b + highlightColor.b) / 2; + blend.a = alpha; graphics->setColor(blend); } } |