From 4ca88642fad0b89209aea9272b835b1e724975ad Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 15 Apr 2003 21:38:23 +0000 Subject: fixed y offset error on ConfigureRequestEvent --- src/Window.cc | 11 +++++------ 1 file 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Window.cc,v 1.136 2003/04/15 18:55:33 fluxgen Exp $ +// $Id: Window.cc,v 1.137 2003/04/15 21:38:23 fluxgen Exp $ #include "Window.hh" @@ -2092,9 +2092,7 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) { int cx = m_frame.x(), cy = m_frame.y(); unsigned int cw = m_frame.width(), ch = m_frame.height(); - unsigned int titlebar_y = (decorations.titlebar ? - m_frame.titlebar().height() + frame().titlebar().borderWidth() - : 0); + if (cr.value_mask & CWBorderWidth) client->old_bw = cr.border_width; @@ -2102,7 +2100,7 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) { cx = cr.x; if (cr.value_mask & CWY) - cy = cr.y - titlebar_y; + cy = cr.y; if (cr.value_mask & CWWidth) cw = cr.width; @@ -2110,8 +2108,9 @@ void FluxboxWindow::configureRequestEvent(XConfigureRequestEvent &cr) { if (cr.value_mask & CWHeight) ch = cr.height; - + // whether we should send ConfigureNotify to clients bool send_notify = false; + // the request is for client window so we resize the frame to it first if (frame().width() != cw || frame().height() != ch) { frame().resizeForClient(cw, ch); -- cgit v0.11.2