summaryrefslogtreecommitdiff
path: root/src/table
diff options
context:
space:
mode:
authorPeterN <peter@fuzzle.org>2018-04-28 22:27:14 +0100
committerGitHub <noreply@github.com>2018-04-28 22:27:14 +0100
commitcfe6a8ea4fc38d58babcc6e7b67a9185ee66078c (patch)
tree866b6e14defd796b53551c1efe34a6c558a9699b /src/table
parent913119487fa58bb4346af8d0024f95b6517f4d46 (diff)
downloadopenttd-cfe6a8ea4fc38d58babcc6e7b67a9185ee66078c.tar.xz
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756)
Diffstat (limited to 'src/table')
-rw-r--r--src/table/settings.ini24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 2554a2ece..693c8246c 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2560,13 +2560,17 @@ strhelp = STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT
strval = STR_CONFIG_SETTING_AUTOSCROLL_DISABLED
cat = SC_BASIC
-[SDTC_BOOL]
-var = gui.reverse_scroll
+[SDTC_VAR]
+var = gui.scroll_mode
+type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def = false
-str = STR_CONFIG_SETTING_REVERSE_SCROLLING
-strhelp = STR_CONFIG_SETTING_REVERSE_SCROLLING_HELPTEXT
-cat = SC_BASIC
+guiflags = SGF_MULTISTRING
+def = 0
+min = 0
+max = 3
+str = STR_CONFIG_SETTING_SCROLLMODE
+strhelp = STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT
+strval = STR_CONFIG_SETTING_SCROLLMODE_DEFAULT
[SDTC_BOOL]
var = gui.smooth_scroll
@@ -2576,14 +2580,6 @@ str = STR_CONFIG_SETTING_SMOOTH_SCROLLING
strhelp = STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT
[SDTC_BOOL]
-var = gui.left_mouse_btn_scrolling
-flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def = false
-str = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING
-strhelp = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT
-cat = SC_BASIC
-
-[SDTC_BOOL]
var = gui.right_mouse_wnd_close
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = false