diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2008-10-15 21:31:37 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2008-10-15 21:31:37 (GMT) |
commit | 6642792f68ae42ba8d2bcbe2033284f7e8e61167 (patch) | |
tree | a20589075db5ec333f7879dc79483512e33d8a4f /src/FbWinFrame.cc | |
parent | ccf096f771f84d8109f81c24a2af5f9510dda3c5 (diff) | |
download | fluxbox-6642792f68ae42ba8d2bcbe2033284f7e8e61167.zip fluxbox-6642792f68ae42ba8d2bcbe2033284f7e8e61167.tar.bz2 |
additional fix for the resize bug
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r-- | src/FbWinFrame.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index ce25004..711e993 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <algorithm> | 38 | #include <algorithm> |
39 | #include <X11/X.h> | 39 | #include <X11/X.h> |
40 | 40 | ||
41 | using std::max; | ||
41 | using std::mem_fun; | 42 | using std::mem_fun; |
42 | using std::string; | 43 | using std::string; |
43 | 44 | ||
@@ -1702,7 +1703,8 @@ int FbWinFrame::yOffset() const { | |||
1702 | 1703 | ||
1703 | void FbWinFrame::applySizeHints(unsigned int &width, unsigned int &height, | 1704 | void FbWinFrame::applySizeHints(unsigned int &width, unsigned int &height, |
1704 | bool maximizing) const { | 1705 | bool maximizing) const { |
1705 | height -= titlebarHeight() + handleHeight(); | 1706 | const int h = height - titlebarHeight() + handleHeight(); |
1707 | height = max(h, static_cast<int>(titlebarHeight() + handleHeight())); | ||
1706 | sizeHints().apply(width, height, maximizing); | 1708 | sizeHints().apply(width, height, maximizing); |
1707 | height += titlebarHeight() + handleHeight(); | 1709 | height += titlebarHeight() + handleHeight(); |
1708 | } | 1710 | } |