From 8dd7eef0402cc6e22642f045e3cfde7f5b011d5b Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Wed, 11 Jul 2007 00:26:20 +0000 Subject: Fixed resizing windows by their resize grip. --- ChangeLog | 6 +++++- src/gui/window.cpp | 13 ++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 073ce04a..0fb3c5ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2007-07-07 Bjørn Lindeijer +2007-07-11 Bjørn Lindeijer + + * src/gui/window.cpp: Fixed resizing windows by their resize grip. + +2007-07-07 Bjørn Lindeijer * src/gui/gui.cpp, src/gui/chatinput.h, src/gui/chatinput.cpp, INSTALL: Ported to Guichan 0.7.0. Unfortunately, since Guichan 0.6.x diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 6165ce70..9f9ce9fc 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -339,10 +339,11 @@ void Window::mousePressed(gcn::MouseEvent &event) mMouseResize |= (y > getHeight() - resizeBorderWidth) ? BOTTOM : (y < resizeBorderWidth) ? TOP : 0; } - else if (event.getSource() == mGrip) + else if (event.getSource() == mGrip && + event.getButton() == gcn::MouseEvent::LEFT) { - mDragOffsetX = x + mGrip->getX(); - mDragOffsetY = y + mGrip->getY(); + mDragOffsetX = x; + mDragOffsetY = y; mMouseResize |= BOTTOM | RIGHT; mIsMoving = false; } @@ -365,10 +366,8 @@ void Window::mouseDragged(gcn::MouseEvent &event) if (mMouseResize && !mIsMoving) { - const int dx = event.getX() - mDragOffsetX + - ((event.getSource() == mGrip) ? mGrip->getX() : 0); - const int dy = event.getY() - mDragOffsetY + - ((event.getSource() == mGrip) ? mGrip->getY() : 0); + const int dx = event.getX() - mDragOffsetX; + const int dy = event.getY() - mDragOffsetY; gcn::Rectangle newDim = getDimension(); if (mMouseResize & (TOP | BOTTOM)) -- cgit v1.2.3-70-g09d2