diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-08-15 13:02:09 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2025-08-15 13:02:16 +0200 |
commit | 442c8a53d368b654d386b7d657e5e3a16d90a2d6 (patch) | |
tree | 39bbc7c1b55620615c9a35b1805cfbb01a09fb1d /src | |
parent | be1585b7827dfeeb0ff67bb55bb03316fc65d4d7 (diff) | |
download | mana-master.tar.gz mana-master.tar.bz2 mana-master.tar.xz mana-master.zip |
In fact in M+ no per-item background appears to be rendered at all, but
I kept the darker gray color for now.
Also fixed the blending of the warning color with the highlight color.
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/buyselldialog.cpp | 11 | ||||
-rw-r--r-- | src/gui/widgets/shoplistbox.cpp | 3 |
2 files changed, 4 insertions, 10 deletions
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); } } |