diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-30 12:46:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-30 12:46:49 +0300 |
| commit | 9bb11133522836a9c5e251550ac88c9a4e091c0e (patch) | |
| tree | f65703ac1a51b79a0766c48420769d28d0847f41 /src/gui/widgets/scrollarea.cpp | |
| parent | e55ed9a138e97f6fba5e3b6858a755f8a50197d2 (diff) | |
| download | manaplus-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.gz manaplus-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.bz2 manaplus-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.xz manaplus-9bb11133522836a9c5e251550ac88c9a4e091c0e.zip | |
Move main window related code into windowmanager.
Diffstat (limited to 'src/gui/widgets/scrollarea.cpp')
| -rw-r--r-- | src/gui/widgets/scrollarea.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index ca29c09fa..d439765af 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -67,6 +67,7 @@ #include "client.h" #include "graphicsvertexes.h" +#include "settings.h" #include "gui/gui.h" #include "gui/skin.h" @@ -288,7 +289,7 @@ void ScrollArea::logic() void ScrollArea::updateAlpha() { - const float alpha = std::max(client->getGuiAlpha(), + const float alpha = std::max(settings.guiAlpha, theme->getMinimumOpacity()); if (alpha != mAlpha) |