aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-03-16 23:11:56 (GMT)
committermarkt <markt>2007-03-16 23:11:56 (GMT)
commitca1ca328cff53d909bd59e49f830499f084e64fa (patch)
tree54d778153ff9892b78bdbcaa7e19026620d1a83f /src/Window.cc
parent84e9f9708546526ce12269b31bec6f0459f0852f (diff)
downloadfluxbox-ca1ca328cff53d909bd59e49f830499f084e64fa.zip
fluxbox-ca1ca328cff53d909bd59e49f830499f084e64fa.tar.bz2
maximizing window with aspect ratio caused windows to be made larger than the screen
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Window.cc b/src/Window.cc
index e471d6e..8e6b887 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1711,7 +1711,7 @@ void FluxboxWindow::maximize(int type) {
1711 1711
1712 ResizeDirection old_resize_corner = m_resize_corner; 1712 ResizeDirection old_resize_corner = m_resize_corner;
1713 m_resize_corner = NOCORNER; 1713 m_resize_corner = NOCORNER;
1714 fixsize(); 1714 fixsize(0, 0, true);
1715 m_resize_corner = old_resize_corner; 1715 m_resize_corner = old_resize_corner;
1716 1716
1717 moveResize(m_last_resize_x, m_last_resize_y, m_last_resize_w, m_last_resize_h); 1717 moveResize(m_last_resize_x, m_last_resize_y, m_last_resize_w, m_last_resize_h);
@@ -3779,7 +3779,7 @@ void FluxboxWindow::changeBlackboxHints(const BlackboxHints &net) {
3779} 3779}
3780 3780
3781 3781
3782void FluxboxWindow::fixsize(int *user_w, int *user_h) { 3782void FluxboxWindow::fixsize(int *user_w, int *user_h, bool maximizing) {
3783 int titlebar_height = (decorations.titlebar ? 3783 int titlebar_height = (decorations.titlebar ?
3784 frame().titlebar().height() + 3784 frame().titlebar().height() +
3785 frame().titlebar().borderWidth() : 0); 3785 frame().titlebar().borderWidth() : 0);
@@ -3795,7 +3795,7 @@ void FluxboxWindow::fixsize(int *user_w, int *user_h) {
3795 // dy = new height (w/o decorations), similarly 3795 // dy = new height (w/o decorations), similarly
3796 int dh = m_last_resize_h - decoration_height; 3796 int dh = m_last_resize_h - decoration_height;
3797 3797
3798 m_client->applySizeHints(dw, dh, user_w, user_h); 3798 m_client->applySizeHints(dw, dh, user_w, user_h, maximizing);
3799 3799
3800 // update last resize 3800 // update last resize
3801 m_last_resize_w = dw; 3801 m_last_resize_w = dw;