aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-05-25 22:14:03 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-05-25 22:14:03 (GMT)
commitc1d400b436e38b6f989adfc2a3d7f1de4f1d13d1 (patch)
tree4e84c9ae2359fd9af7de31930cbcc230c2c3cb57
parent46bca62a9cd8052bd8749da8b1aa7539d5fe8c23 (diff)
downloadfluxbox-c1d400b436e38b6f989adfc2a3d7f1de4f1d13d1.zip
fluxbox-c1d400b436e38b6f989adfc2a3d7f1de4f1d13d1.tar.bz2
another fix for saving and restoring window dimensions
-rw-r--r--src/Remember.cc3
-rw-r--r--src/Window.cc8
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index 2bd691f..ff0094c 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -978,8 +978,7 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
978 app->rememberHead(win->screen().getHead(win->fbWindow())); 978 app->rememberHead(win->screen().getHead(win->fbWindow()));
979 break; 979 break;
980 case REM_DIMENSIONS: 980 case REM_DIMENSIONS:
981 //!! Note: This is odd, why dont we need to substract border width on win->width() ? 981 app->rememberDimensions(win->normalWidth(), win->normalHeight());
982 app->rememberDimensions(win->normalWidth(), win->normalHeight() - 2 * win->fbWindow().borderWidth());
983 break; 982 break;
984 case REM_POSITION: { 983 case REM_POSITION: {
985 int head = win->screen().getHead(win->fbWindow()); 984 int head = win->screen().getHead(win->fbWindow());
diff --git a/src/Window.cc b/src/Window.cc
index 29acd3b..b9a454b 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3701,25 +3701,25 @@ bool FluxboxWindow::isTransient() const {
3701} 3701}
3702 3702
3703int FluxboxWindow::normalX() const { 3703int FluxboxWindow::normalX() const {
3704 if (maximized & MAX_HORZ) 3704 if (maximized & MAX_HORZ || fullscreen)
3705 return m_old_pos_x; 3705 return m_old_pos_x;
3706 return x(); 3706 return x();
3707} 3707}
3708 3708
3709int FluxboxWindow::normalY() const { 3709int FluxboxWindow::normalY() const {
3710 if (maximized & MAX_VERT) 3710 if (maximized & MAX_VERT || fullscreen)
3711 return m_old_pos_y; 3711 return m_old_pos_y;
3712 return y(); 3712 return y();
3713} 3713}
3714 3714
3715unsigned int FluxboxWindow::normalWidth() const { 3715unsigned int FluxboxWindow::normalWidth() const {
3716 if (maximized & MAX_HORZ) 3716 if (maximized & MAX_HORZ || fullscreen)
3717 return m_old_width; 3717 return m_old_width;
3718 return width(); 3718 return width();
3719} 3719}
3720 3720
3721unsigned int FluxboxWindow::normalHeight() const { 3721unsigned int FluxboxWindow::normalHeight() const {
3722 if (maximized & MAX_VERT) 3722 if (maximized & MAX_VERT || fullscreen)
3723 return m_old_height; 3723 return m_old_height;
3724 if (shaded) 3724 if (shaded)
3725 return frame().normalHeight(); 3725 return frame().normalHeight();