diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-04-13 22:54:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-04-13 22:54:28 +0300 |
| commit | bcdf34645ff3067d3b4110120b6191af2b0b2e99 (patch) | |
| tree | 428493a138f0fdaebd4c915153f0dcdcbaedf76d /src/gui/widgets/window.cpp | |
| parent | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (diff) | |
| parent | b64a1f46b930516927b1290c1d6771b491b84958 (diff) | |
| download | plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.gz plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.bz2 plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.xz plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/widgets/window.cpp')
| -rw-r--r-- | src/gui/widgets/window.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 9e032f75b..c7212314d 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -109,7 +109,6 @@ Window::Window(const std::string &caption, const bool modal, mDefaultY(0), mDefaultWidth(0), mDefaultHeight(0), - mRedraw(true), mLastRedraw(true), mGrip(nullptr), mParent(parent), @@ -1218,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) |