dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2017-04-01 01:14:28 +01:00
parent 83091f55da 86d1a00ba6
commit 8317eac918
81 changed files with 473 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/window.cpp
View File

@@ -772,7 +772,12 @@ static void DispatchRightClickEvent(Window *w, int x, int y)
if (w->OnRightClick(pt, wid->index)) return;
}
if (_settings_client.gui.hover_delay_ms == 0 && wid->tool_tip != 0) GuiShowTooltips(w, wid->tool_tip, 0, NULL, TCC_RIGHT_CLICK);
/* Right-click close is enabled and there is a closebox */
if (_settings_client.gui.right_mouse_wnd_close && w->nested_root->GetWidgetOfType(WWT_CLOSEBOX)) {
delete w;
} else if (_settings_client.gui.hover_delay_ms == 0 && wid->tool_tip != 0) {
GuiShowTooltips(w, wid->tool_tip, 0, NULL, TCC_RIGHT_CLICK);
}
}
/**
@@ -2849,11 +2854,12 @@ static void MouseLoop(MouseClick click, int mousewheel)
if (HandleViewportDoubleClicked(w, x, y)) break;
/* FALL THROUGH */
case MC_LEFT:
if (!HandleViewportClicked(vp, x, y, click == MC_DOUBLE_LEFT) &&
!(w->flags & WF_DISABLE_VP_SCROLL) &&
if (HandleViewportClicked(vp, x, y, click == MC_DOUBLE_LEFT)) return;
if (!(w->flags & WF_DISABLE_VP_SCROLL) &&
_settings_client.gui.left_mouse_btn_scrolling) {
_scrolling_viewport = w;
_cursor.fix_at = false;
return;
}
break;
@@ -2865,13 +2871,16 @@ static void MouseLoop(MouseClick click, int mousewheel)
/* clear 2D scrolling caches before we start a 2D scroll */
_cursor.h_wheel = 0;
_cursor.v_wheel = 0;
return;
}
break;
default:
break;
}
} else {
}
if (vp == NULL || (w->flags & WF_DISABLE_VP_SCROLL)) {
switch (click) {
case MC_LEFT:
case MC_DOUBLE_LEFT: