diff options
Diffstat (limited to 'src/gui')
| -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); } } |