diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-04-11 21:08:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-04-11 21:08:02 +0300 |
commit | aef5053e87c93a8987f89e4fdaf6cf3dd23efe81 (patch) | |
tree | 1114d14958b13eba28a51e57722d6c4da0b9d2e7 /src/gui/widgets | |
parent | a50ecdf6045ba0f0d5e91d10ddeb8d5520ba55cb (diff) | |
download | manaplus-aef5053e87c93a8987f89e4fdaf6cf3dd23efe81.tar.gz manaplus-aef5053e87c93a8987f89e4fdaf6cf3dd23efe81.tar.bz2 manaplus-aef5053e87c93a8987f89e4fdaf6cf3dd23efe81.tar.xz manaplus-aef5053e87c93a8987f89e4fdaf6cf3dd23efe81.zip |
fix code style.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/tabs/setup_input.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/window.cpp | 7 | ||||
-rw-r--r-- | src/gui/widgets/window.h | 5 |
3 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index a29e0d797..74ee7a3dc 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -212,7 +212,7 @@ void Setup_Input::cancel() void Setup_Input::action(const ActionEvent &event) { - const std::string id = event.getId(); + const std::string &id = event.getId(); if (event.getSource() == mKeyList) { diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 7cad9999c..c7212314d 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -1217,13 +1217,6 @@ bool Window::isResizeAllowed(const MouseEvent &event) const return false; } -int Window::getGuiAlpha() const -{ - const float alpha = std::max(client->getGuiAlpha(), - theme->getMinimumOpacity()); - return static_cast<int>(alpha * 255.0F); -} - Layout &Window::getLayout() { if (!mLayout) diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 175cc25f0..1795f2843 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -448,11 +448,6 @@ class Window : public BasicContainer2, */ void setModal(const bool modal); - /** - * Gets the alpha value used by the window, in a GUIChan usable format. - */ - int getGuiAlpha() const A_WARN_UNUSED; - Rect getWindowArea() const A_WARN_UNUSED; bool isResizeAllowed(const MouseEvent &event) const A_WARN_UNUSED; |