cpp/openttd-patchpack/source Changeset - r15261:2c8e46da4f5d

Changeset - r15261:2c8e46da4f5d

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 14 years ago 2010-05-30 12:18:49
alberth@openttd.org

(svn r19906) -Codechange: HandleMouseOver() never ends, so don't return an event handling state.

1 file changed with 4 insertions and 5 deletions:

src/window.cpp

0 comments (0 inline, 0 general)

src/window.cpp

➞

Show inline comments

@@ @@ -1406,7 +1406,8 @@ static EventState HandleMouseDrag() @@
 	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 @@ static bool HandleMouseOver() @@
 		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 @@ static void MouseLoop(MouseClick click, @@
 	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;

0 comments (0 inline, 0 general)