mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.1
alberth 2010-05-30 12:18:49 +00:00
parent ce0e1cbb3f
commit cf060d16ec
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/window.cpp
View File

@ -1406,7 +1406,8 @@ static EventState HandleMouseDrag()
return ES_HANDLED; 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); 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); const NWidgetCore *widget = w->nested_root->GetWidgetFromPos(pt.x, pt.y);
if (widget != NULL) w->OnMouseOver(pt, widget->index); if (widget != NULL) w->OnMouseOver(pt, widget->index);
} }
/* Mouseover never stops execution */
return true;
} }
/** /**
@ -2094,7 +2092,8 @@ static void MouseLoop(MouseClick click, int mousewheel)
if (HandleWindowDragging() == ES_HANDLED) return; if (HandleWindowDragging() == ES_HANDLED) return;
if (HandleScrollbarScrolling() == ES_HANDLED) return; if (HandleScrollbarScrolling() == ES_HANDLED) return;
if (HandleViewportScroll() == 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); 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; if (click == MC_NONE && mousewheel == 0 && !scrollwheel_scrolling) return;