aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 19446d9..69877e2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.136 2003/04/15 18:55:33 fluxgen Exp $ 25// $Id: Window.cc,v 1.137 2003/04/15 21:38:23 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2092,9 +2092,7 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
2092 2092
2093 int cx = m_frame.x(), cy = m_frame.y(); 2093 int cx = m_frame.x(), cy = m_frame.y();
2094 unsigned int cw = m_frame.width(), ch = m_frame.height(); 2094 unsigned int cw = m_frame.width(), ch = m_frame.height();
2095 unsigned int titlebar_y = (decorations.titlebar ? 2095
2096 m_frame.titlebar().height() + frame().titlebar().borderWidth()
2097 : 0);
2098 if (cr.value_mask & CWBorderWidth) 2096 if (cr.value_mask & CWBorderWidth)
2099 client->old_bw = cr.border_width; 2097 client->old_bw = cr.border_width;
2100 2098
@@ -2102,7 +2100,7 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
2102 cx = cr.x; 2100 cx = cr.x;
2103 2101
2104 if (cr.value_mask & CWY) 2102 if (cr.value_mask & CWY)
2105 cy = cr.y - titlebar_y; 2103 cy = cr.y;
2106 2104
2107 if (cr.value_mask & CWWidth) 2105 if (cr.value_mask & CWWidth)
2108 cw = cr.width; 2106 cw = cr.width;
@@ -2110,8 +2108,9 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) {
2110 if (cr.value_mask & CWHeight) 2108 if (cr.value_mask & CWHeight)
2111 ch = cr.height; 2109 ch = cr.height;
2112 2110
2113 2111 // whether we should send ConfigureNotify to clients
2114 bool send_notify = false; 2112 bool send_notify = false;
2113
2115 // the request is for client window so we resize the frame to it first 2114 // the request is for client window so we resize the frame to it first
2116 if (frame().width() != cw || frame().height() != ch) { 2115 if (frame().width() != cw || frame().height() != ch) {
2117 frame().resizeForClient(cw, ch); 2116 frame().resizeForClient(cw, ch);