From 41b3b70e2343a0493b4100ff29c2ec0fc2d1e269 Mon Sep 17 00:00:00 2001
From: MoNTE48 <MoNTE48@mail.ua>
Date: Sat, 15 Jan 2022 19:52:42 +0100
Subject: [PATCH] Mobile: improve simple Settings Menu

---
 builtin/mainmenu/tab_online.lua          |  5 +++--
 builtin/mainmenu/tab_settings_simple.lua | 24 ++++++++++++++++--------
 src/touchscreengui.cpp                   |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/builtin/mainmenu/tab_online.lua b/builtin/mainmenu/tab_online.lua
index cfa03126..a5d22f05 100644
--- a/builtin/mainmenu/tab_online.lua
+++ b/builtin/mainmenu/tab_online.lua
@@ -76,7 +76,7 @@ local function get_formspec(_, _, tabdata)
 			esc(core.settings:get("name")) .. "]" ..
 
 		-- Description Background
-		"box[7.1,2.1;4.8,2.65;#999999]" ..
+		"box[7.1,2.1;4.8,2.65;#33314B99]" ..
 
 		-- Connect
 		"image_button[8.8,4.88;3.3,0.9;" ..
@@ -143,7 +143,8 @@ local function get_formspec(_, _, tabdata)
 					table.insert(menudata.favorites, i, table.remove(menudata.favorites, j))
 				end
 			end
-				if favs[i].address ~= menudata.favorites[i].address then
+				if favs[i] and menudata.favorites[i] and
+						favs[i].address ~= menudata.favorites[i].address then
 					table.insert(menudata.favorites, i, favs[i])
 				end
 			end
diff --git a/builtin/mainmenu/tab_settings_simple.lua b/builtin/mainmenu/tab_settings_simple.lua
index 8ec87413..c0a24d86 100644
--- a/builtin/mainmenu/tab_settings_simple.lua
+++ b/builtin/mainmenu/tab_settings_simple.lua
@@ -46,7 +46,7 @@ local getSettingIndex = {
 local function formspec(tabview, name, tabdata)
 	local fps = tonumber(core.settings:get("fps_max"))
 	local range = tonumber(core.settings:get("viewing_range"))
-	local touchthreshold = tonumber(core.settings:get("touchscreen_threshold")) or 0
+	local sensitivity = tonumber(core.settings:get("mouse_sensitivity")) * 2000
 	local touchtarget = core.settings:get_bool("touchtarget") or false
 	local sound = tonumber(core.settings:get("sound_volume")) ~= 0 and true or false
 
@@ -88,9 +88,8 @@ local function formspec(tabview, name, tabdata)
 		"dropdown[4.25,3.3;3.5;dd_node_highlighting;" .. dd_options.node_highlighting[1] .. ";"
 				.. getSettingIndex.NodeHighlighting() .. "]" ..
 
-		"label[4.25,4.2;" .. fgettext("Touchthreshold (px)") .. ":]" ..
-		"dropdown[4.25,4.65;3.5;dd_touchthreshold;0,10,20,30,40,50;" ..
-			(touchthreshold / 10) + 1 .. "]" ..
+		"label[4.25,4.2;" .. fgettext("Mouse sensitivity") .. ":]" ..
+		"scrollbar[4.25,4.65;3.22,0.5;horizontal;sb_sensitivity;" .. sensitivity .. "]" ..
 
 	--	"box[8,0;3.75,4.5;#999999]"
 		"box[8,0;3.75,5.5;#999999]"
@@ -178,7 +177,7 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
 		return true
 	end
 	if fields["cb_fancy_leaves"] then
-		core.settings:set("dd_leaves_style", fields["dd_touchthreshold"] and "fancy" or "opaque")
+		core.settings:set("dd_leaves_style", fields["cb_fancy_leaves"] and "fancy" or "opaque")
 		ddhandled = true
 	end
 	if fields["cb_touchtarget"] then
@@ -234,9 +233,18 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
 		core.settings:set("viewing_range", fields["dd_viewing_range"])
 		ddhandled = true
 	end
-	if fields["dd_touchthreshold"] then
-		core.settings:set("touchscreen_threshold", fields["dd_touchthreshold"])
-		ddhandled = true
+	if fields["sb_sensitivity"] then
+		-- reset old setting
+		core.settings:remove("touchscreen_threshold")
+
+		local event = core.explode_scrollbar_event(fields["sb_sensitivity"])
+		if event.type == "CHG" then
+			core.settings:set("mouse_sensitivity", event.value / 2000)
+
+			-- The formspec cannot be updated or the scrollbar movement will
+			-- break.
+			ddhandled = false
+		end
 	end
 
 	return ddhandled
diff --git a/src/touchscreengui.cpp b/src/touchscreengui.cpp
index 051a6e64..deeae25c 100644
--- a/src/touchscreengui.cpp
+++ b/src/touchscreengui.cpp
@@ -657,7 +657,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 					s32 dy = Y - m_pointerpos[event.TouchInput.ID].Y;
 
 					// adapt to similar behaviour as pc screen
-					double d = g_settings->getFloat("mouse_sensitivity");
+					double d = rangelim(g_settings->getFloat("mouse_sensitivity"), 0.1, 1.0);
 
 					m_camera_yaw_change -= dx * d;
 					m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dy * d), -180), 180);