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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/economy.cpp
This commit is contained in:
Jonathan G Rennison
2019-02-22 01:00:38 +00:00
parent 664ecdcb89 690d1dd6a4
commit 635ee89b86
15 changed files with 658 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/window_gui.h
View File

@@ -376,7 +376,7 @@ public:
NWidgetStacked *shade_select; ///< Selection widget (#NWID_SELECTION) to use for shading the window. If \c NULL, window cannot shade.
Dimension unshaded_size; ///< Last known unshaded size (only valid while shaded).
int scrolling_scrollbar; ///< Widgetindex of just being dragged scrollbar. -1 if none is active.
int mouse_capture_widget; ///< Widgetindex of current mouse capture widget (e.g. dragged scrollbar). -1 if no widget has mouse capture.
Window *parent; ///< Parent window.