[Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.11,1.12

James Brown ender at users.sourceforge.net
Mon Jul 8 06:55:03 CEST 2002


Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv24207/gui

Modified Files:
	dialog.cpp 
Log Message:
Fix mouseout



Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dialog.cpp	8 Jul 2002 13:52:50 -0000	1.11
+++ dialog.cpp	8 Jul 2002 13:54:11 -0000	1.12
@@ -67,8 +67,6 @@
 void Dialog::handleMouseMoved(int x, int y, int button)
 {
 	Widget *w = findWidget(x - _x, y - _y);
-	if (!w)
-		return;
 
 	if (_mouseWidget != w) {
 		if (_mouseWidget)
@@ -76,7 +74,12 @@
 		if (w)
 			w->handleMouseEntered(button);
 		_mouseWidget = w;
-	} else if (w->getFlags() & WIDGET_TRACK_MOUSE) {
+	} 
+
+	if (!w)
+		return;
+	
+	if (w->getFlags() & WIDGET_TRACK_MOUSE) {
 		w->handleMouseMoved(x - _x - w->_x, y - _y - w->_y, button);
 	}
 }





More information about the Scummvm-git-logs mailing list