Mercurial > hg > openttd

changeset 15271:dbede9fa4eb0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19906) -Codechange: HandleMouseOver() never ends, so don't return an event handling state.
author alberth <alberth@openttd.org>
date Sun, 30 May 2010 12:18:49 +0000
parents e2fcc8072ae6
children a3d5536488ff
files src/window.cpp
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1406,7 +1406,8 @@
 	return ES_HANDLED;
 }
 
-static bool HandleMouseOver()
+/** Report position of the mouse to the underlying window. */
+static void HandleMouseOver()
 {
 	Window *w = FindWindowFromPt(_cursor.pos.x, _cursor.pos.y);
 
@@ -1426,9 +1427,6 @@
 		const NWidgetCore *widget = w->nested_root->GetWidgetFromPos(pt.x, pt.y);
 		if (widget != NULL) w->OnMouseOver(pt, widget->index);
 	}
-
-	/* Mouseover never stops execution */
-	return true;
 }
 
 /**
@@ -2094,7 +2092,8 @@
 	if (HandleWindowDragging()     == ES_HANDLED) return;
 	if (HandleScrollbarScrolling() == ES_HANDLED) return;
 	if (HandleViewportScroll()     == ES_HANDLED) return;
-	if (!HandleMouseOver())          return;
+
+	HandleMouseOver();
 
 	bool scrollwheel_scrolling = _settings_client.gui.scrollwheel_scrolling == 1 && (_cursor.v_wheel != 0 || _cursor.h_wheel != 0);
 	if (click == MC_NONE && mousewheel == 0 && !scrollwheel_scrolling) return;