aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-15 11:04:56 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-15 11:04:56 (GMT)
commit4fa3773267362f8ca9f653bb8ee7c98baa09d5fd (patch)
treed77ee1cde06ab0b5d4a403f236aff4a51d418c89 /src/Window.cc
parent80059c6dae8de4962b14f08bd75f1c773e37a78d (diff)
downloadfluxbox-4fa3773267362f8ca9f653bb8ee7c98baa09d5fd.zip
fluxbox-4fa3773267362f8ca9f653bb8ee7c98baa09d5fd.tar.bz2
move size hint code to FbWinFrame
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 651b995..45c1e9d 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -552,7 +552,7 @@ void FluxboxWindow::init() {
552 552
553 int real_width = frame().width(); 553 int real_width = frame().width();
554 int real_height = frame().height() - frame().titlebarHeight() - frame().handleHeight(); 554 int real_height = frame().height() - frame().titlebarHeight() - frame().handleHeight();
555 m_client->applySizeHints(real_width, real_height); 555 frame().applySizeHints(real_width, real_height);
556 real_height += frame().titlebarHeight() + frame().handleHeight(); 556 real_height += frame().titlebarHeight() + frame().handleHeight();
557 557
558 if (m_placed) 558 if (m_placed)
@@ -1066,6 +1066,7 @@ bool FluxboxWindow::setCurrentClient(WinClient &client, bool setinput) {
1066 // frame focused doesn't necessarily mean input focused 1066 // frame focused doesn't necessarily mean input focused
1067 frame().setLabelButtonFocus(*button); 1067 frame().setLabelButtonFocus(*button);
1068 frame().setShapingClient(&client, false); 1068 frame().setShapingClient(&client, false);
1069 frame().setSizeHints(client.sizeHints());
1069 return ret; 1070 return ret;
1070} 1071}
1071 1072
@@ -1090,6 +1091,7 @@ void FluxboxWindow::associateClientWindow(bool use_attrs,
1090 frame().resizeForClient(m_client->width(), m_client->height()); 1091 frame().resizeForClient(m_client->width(), m_client->height());
1091 1092
1092 frame().setActiveGravity(m_client->gravity(), m_client->old_bw); 1093 frame().setActiveGravity(m_client->gravity(), m_client->old_bw);
1094 frame().setSizeHints(m_client->sizeHints());
1093 frame().setClientWindow(*m_client); 1095 frame().setClientWindow(*m_client);
1094} 1096}
1095 1097
@@ -3728,7 +3730,7 @@ void FluxboxWindow::fixsize(int *user_w, int *user_h, bool maximizing) {
3728 // dy = new height (w/o decorations), similarly 3730 // dy = new height (w/o decorations), similarly
3729 int dh = m_last_resize_h - decoration_height; 3731 int dh = m_last_resize_h - decoration_height;
3730 3732
3731 m_client->applySizeHints(dw, dh, user_w, user_h, maximizing); 3733 frame().applySizeHints(dw, dh, user_w, user_h, maximizing);
3732 3734
3733 // update last resize 3735 // update last resize
3734 m_last_resize_w = dw; 3736 m_last_resize_w = dw;