From 0e078670b7c32646bec6431d5dc48df450babc5d Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 14 Jul 2010 17:36:27 +0000 Subject: (svn r20145) -Codechange: keep original RMB->tooltip behaviour when hovering is disabled and there is no handled right click event for the widget, i.e. if a widget would handle the right click you won't see the tooltip anymore by right clicking; by enabling hovering you would get access to that tooltip again. --- src/window.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/window.cpp') diff --git a/src/window.cpp b/src/window.cpp index 5658e6887..5c9eeb7f5 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -383,12 +383,15 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, int click_count) static void DispatchRightClickEvent(Window *w, int x, int y) { NWidgetCore *wid = w->nested_root->GetWidgetFromPos(x, y); + if (wid == NULL) return; /* No widget to handle, or the window is not interested in it. */ - if (wid == NULL || wid->index < 0) return; + if (wid->index >= 0) { + Point pt = { x, y }; + if (w->OnRightClick(pt, wid->index)) return; + } - Point pt = { x, y }; - w->OnRightClick(pt, wid->index); + if (_settings_client.gui.hover_delay == 0 && wid->tool_tip != 0) GuiShowTooltips(wid->tool_tip, 0, NULL, TCC_RIGHT_CLICK); } /** -- cgit v1.2.3-54-g00ecf