From eabe17251a0d3b1915c8b3eb794a233f0322dfba Mon Sep 17 00:00:00 2001
From: Xottab-DUTY <xottab-duty@yandex.ru>
Date: Thu, 9 Jan 2025 02:41:28 +0300
Subject: [PATCH] Improved gamepad navigation in the game UI (#943)

Support for stick navigation
---
 res/gamedata/configs/ui/ui_mm_load_dlg.xml    |  6 +--
 res/gamedata/configs/ui/ui_mm_load_dlg_16.xml |  6 +--
 res/gamedata/configs/ui/ui_mm_opt.xml         | 28 +++++------
 res/gamedata/configs/ui/ui_mm_opt_16.xml      | 26 +++++------
 res/gamedata/configs/ui/ui_mm_save_dlg.xml    |  6 +--
 res/gamedata/configs/ui/ui_mm_save_dlg_16.xml |  6 +--
 res/gamedata/scripts/ui_load_dialog.script    |  8 +++-
 res/gamedata/scripts/ui_main_menu.script      |  5 +-
 res/gamedata/scripts/ui_mm_mp_gamespy.script  | 10 +++-
 res/gamedata/scripts/ui_mm_mp_localnet.script |  7 ++-
 res/gamedata/scripts/ui_mm_opt_main.script    |  2 +
 res/gamedata/scripts/ui_mp_main.script        |  7 ++-
 res/gamedata/scripts/ui_numpad.script         | 21 ++++++++-
 res/gamedata/scripts/ui_save_dialog.script    | 10 ++--
 res/gamedata/scripts/ui_sleep_dialog.script   |  5 +-
 src/xrGame/UIDialogHolder.cpp                 | 46 +++++++++++++++++++
 src/xrGame/ui/UIDialogWnd.h                   |  2 +-
 src/xrGame/ui/UIMMShniaga.cpp                 | 10 ++--
 src/xrUICore/ListBox/UIListBoxItem.cpp        |  6 +++
 src/xrUICore/ListBox/UIListBoxItem.h          |  1 +
 src/xrUICore/ListWnd/UIListItem.cpp           |  2 +
 21 files changed, 162 insertions(+), 58 deletions(-)

diff --git a/res/gamedata/configs/ui/ui_mm_load_dlg.xml b/res/gamedata/configs/ui/ui_mm_load_dlg.xml
index 006e8370a17..a1226770e04 100644
--- a/res/gamedata/configs/ui/ui_mm_load_dlg.xml
+++ b/res/gamedata/configs/ui/ui_mm_load_dlg.xml
@@ -41,15 +41,15 @@
 	    <list x="33" y="215" width="497" height="173" item_height="18" can_select="1">
 		    <font font="letterica16"/>
 	    </list>
-	    <btn_load x="65" y="427" width="135" height="26">
+	    <btn_load x="65" y="427" width="135" height="26" accel="ui_accept">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_load</text>
 	    </btn_load>
-	    <btn_delete x="221" y="427" width="135" height="26">
+	    <btn_delete x="221" y="427" width="135" height="26" accel="ui_action_1">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_delete</text>
 	    </btn_delete>
-	    <btn_cancel x="377" y="427" width="135" height="26">
+	    <btn_cancel x="377" y="427" width="135" height="26" accel="ui_back">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_cancel</text>
 	    </btn_cancel>
diff --git a/res/gamedata/configs/ui/ui_mm_load_dlg_16.xml b/res/gamedata/configs/ui/ui_mm_load_dlg_16.xml
index da0ca100fdb..8d88d7ef145 100644
--- a/res/gamedata/configs/ui/ui_mm_load_dlg_16.xml
+++ b/res/gamedata/configs/ui/ui_mm_load_dlg_16.xml
@@ -47,15 +47,15 @@
 	    <list x="26" y="215" width="417" height="173" item_height="18" can_select="1">
 		    <font font="letterica16"/>
 	    </list>
-	    <btn_load x="54" y="427" width="108" height="26" stretch="1">
+	    <btn_load x="54" y="427" width="108" height="26" stretch="1" accel="ui_accept">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_load</text>
 	    </btn_load>
-	    <btn_delete x="184" y="427" width="108" height="26" stretch="1">
+	    <btn_delete x="184" y="427" width="108" height="26" stretch="1" accel="ui_action_1">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_delete</text>
 	    </btn_delete>
-	    <btn_cancel x="314" y="427" width="108" height="26" stretch="1">
+	    <btn_cancel x="314" y="427" width="108" height="26" stretch="1" accel="ui_back">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_cancel</text>
 	    </btn_cancel>
diff --git a/res/gamedata/configs/ui/ui_mm_opt.xml b/res/gamedata/configs/ui/ui_mm_opt.xml
index ed8b11ab049..4e76b90b0e8 100644
--- a/res/gamedata/configs/ui/ui_mm_opt.xml
+++ b/res/gamedata/configs/ui/ui_mm_opt.xml
@@ -19,7 +19,7 @@
 	        </auto_static>
 		</dialog>
 
-		<btn_accept x="105" y="431" width="135" height="26">
+		<btn_accept x="105" y="431" width="135" height="26" accel="ui_accept">
 			<text font="letterica18" align="c">ui_mm_apply</text>
 			<texture>ui_inGame2_Mp_bigbuttone</texture>
             <text_color>
@@ -27,7 +27,7 @@
             </text_color>
 		</btn_accept>
 
-		<btn_cancel x="246" y="431" width="135" height="26">
+		<btn_cancel x="246" y="431" width="135" height="26" accel="ui_back">
 			<text font="letterica18" align="c">ui_mm_cancel</text>
 			<texture>ui_inGame2_Mp_bigbuttone</texture>
             <text_color>
@@ -35,8 +35,8 @@
             </text_color>
 		</btn_cancel>
 
-		<tab x="14" y="27" width="461" height="38">
-			<button x="2" y="2" width="131" height="25" id="video">
+		<tab x="14" y="27" width="461" height="38" accelerators="1">
+			<button x="2" y="2" width="131" height="25" id="video" accel="ui_button_1">
 				<texture>ui_inGame2_opt_button_1</texture>
 				<text font="letterica18" align="c">ui_mm_video</text>
 				<text_color>
@@ -44,7 +44,7 @@
 				</text_color>
 			</button>
 
-			<button x="111" y="2" width="131" height="25" id="sound">
+			<button x="111" y="2" width="131" height="25" id="sound" accel="ui_button_2">
 				<texture>ui_inGame2_opt_button_1</texture>
 				<text font="letterica18" align="c">ui_mm_sound</text>
 				<text_color>
@@ -52,7 +52,7 @@
 				</text_color>
 			</button>
 
-			<button x="221" y="2" width="131" height="25" id="gameplay">
+			<button x="221" y="2" width="131" height="25" id="gameplay" accel="ui_button_3">
 	            <texture>ui_inGame2_opt_button_1</texture>
 	            <text font="letterica18" align="c">ui_mm_gameplay</text>
 				<text_color>
@@ -60,7 +60,7 @@
 				</text_color>
 			</button>
 
-			<button x="330" y="2" width="129" height="25" id="controls">
+			<button x="330" y="2" width="129" height="25" id="controls" accel="ui_button_4">
 	            <texture>ui_inGame2_opt_button_2</texture>
 	            <text font="letterica18" align="c">ui_mm_controls</text>
 				<text_color>
@@ -165,7 +165,7 @@
             <options_item entry="rs_c_brightness" group="mm_opt_video" depend="runtime"/>
         </track_brightness>
 
-        <btn_advanced x="338" y="322" width="108" height="24">
+        <btn_advanced x="338" y="322" width="108" height="24" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_advanced</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -523,7 +523,7 @@
             <options_item entry="r4_enable_tessellation" group="mm_opt_video_adv" depend="vid"/>
         </check_r4_tessellation>
 
-        <btn_to_simply x="338" y="322" width="108" height="24">
+        <btn_to_simply x="338" y="322" width="108" height="24" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_simply</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -806,7 +806,7 @@
             </scroll_view>
         </key_binding>
 
-        <btn_default x="338" y="322" width="108" height="24">
+        <btn_default x="338" y="322" width="108" height="24" accel="ui_action_2">
             <text align="c" font="letterica16">ui_mm_default</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -814,7 +814,7 @@
 			</text_color>
         </btn_default>
 		
-		<btn_advanced x="201" y="322" width="133" height="24" stretch="1">
+		<btn_advanced x="201" y="322" width="133" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_gamepad_setup</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -860,7 +860,7 @@
             </scroll_view>
         </key_binding_gamepad>
 
-		<btn_default x="338" y="322" width="108" height="24" stretch="1">
+		<btn_default x="338" y="322" width="108" height="24" stretch="1" accel="ui_action_2">
             <text align="c" font="letterica16">ui_mm_default</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -868,7 +868,7 @@
 			</text_color>
         </btn_default>
 		
-		<btn_controls x="191" y="322" width="143" height="24" stretch="1">
+		<btn_controls x="191" y="322" width="143" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_keyboard_setup</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -896,6 +896,6 @@
         <text_color>
             <e r="170" g="170" b="170"/>
         </text_color>
-        <texture>ui_button_ordinary</texture>
+        <texture>ui_buttonordinary</texture>
     </btn_cancel_download>
 </w>
diff --git a/res/gamedata/configs/ui/ui_mm_opt_16.xml b/res/gamedata/configs/ui/ui_mm_opt_16.xml
index 78d6b9cefe4..9ef450d7a56 100644
--- a/res/gamedata/configs/ui/ui_mm_opt_16.xml
+++ b/res/gamedata/configs/ui/ui_mm_opt_16.xml
@@ -22,7 +22,7 @@
 	        </auto_static>
 		</dialog>
 
-		<btn_accept x="84" y="431" width="108" height="26" stretch="1">
+		<btn_accept x="84" y="431" width="108" height="26" stretch="1" accel="ui_accept">
 			<text font="letterica18" align="c">ui_mm_apply</text>
 			<texture>ui_inGame2_Mp_bigbuttone</texture>
             <text_color>
@@ -30,7 +30,7 @@
             </text_color>
 		</btn_accept>
 
-		<btn_cancel x="196" y="431" width="108" height="26" stretch="1">
+		<btn_cancel x="196" y="431" width="108" height="26" stretch="1" accel="ui_back">
 			<text font="letterica18" align="c">ui_mm_cancel</text>
 			<texture>ui_inGame2_Mp_bigbuttone</texture>
             <text_color>
@@ -38,8 +38,8 @@
             </text_color>
 		</btn_cancel>
 
-		<tab x="11" y="27" width="368" height="38">
-			<button x="1" y="2" width="105" height="25" id="video" stretch="1">
+		<tab x="11" y="27" width="368" height="38" accelerators="1">
+			<button x="1" y="2" width="105" height="25" id="video" stretch="1" accel="ui_button_1">
 				<texture>ui_inGame2_opt_button_1</texture>
 				<text font="letterica18" align="c">ui_mm_video</text>
 				<text_color>
@@ -47,7 +47,7 @@
 				</text_color>
 			</button>
 
-			<button x="89" y="2" width="104" height="25" id="sound" stretch="1">
+			<button x="89" y="2" width="104" height="25" id="sound" stretch="1" accel="ui_button_2">
 				<texture>ui_inGame2_opt_button_1</texture>
 				<text font="letterica18" align="c">ui_mm_sound</text>
 				<text_color>
@@ -55,7 +55,7 @@
 				</text_color>
 			</button>
 
-			<button x="176" y="2" width="105" height="25" id="gameplay" stretch="1">
+			<button x="176" y="2" width="105" height="25" id="gameplay" stretch="1" accel="ui_button_3">
 	            <texture>ui_inGame2_opt_button_1</texture>
 	            <text font="letterica18" align="c">ui_mm_gameplay</text>
 				<text_color>
@@ -63,7 +63,7 @@
 				</text_color>
 			</button>
 
-			<button x="264" y="2" width="103" height="25" id="controls" stretch="1">
+			<button x="264" y="2" width="103" height="25" id="controls" stretch="1" accel="ui_button_4">
 	            <texture>ui_inGame2_opt_button_2</texture>
 	            <text font="letterica18" align="c">ui_mm_controls</text>
 				<text_color>
@@ -168,7 +168,7 @@
             <options_item entry="rs_c_brightness" group="mm_opt_video" depend="runtime"/>
         </track_brightness>
 
-        <btn_advanced x="270" y="322" width="86" height="24" stretch="1">
+        <btn_advanced x="270" y="322" width="86" height="24" stretch="1" accel="ui_action_1">
             <text r="170" g="170" b="170" align="c" font="letterica16">ui_mm_advanced</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -526,7 +526,7 @@
             <options_item entry="r4_enable_tessellation" group="mm_opt_video_adv" depend="vid"/>
         </check_r4_tessellation>
 
-        <btn_to_simply x="270" y="322" width="86" height="24" stretch="1">
+        <btn_to_simply x="270" y="322" width="86" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_simply</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -808,7 +808,7 @@
             </scroll_view>
         </key_binding>
 
-        <btn_default x="270" y="322" width="86" height="24" stretch="1">
+        <btn_default x="270" y="322" width="86" height="24" stretch="1" accel="ui_action_2">
             <text align="c" font="letterica16">ui_mm_default</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -816,7 +816,7 @@
 			</text_color>
         </btn_default>
 		
-		<btn_advanced x="156" y="322" width="110" height="24" stretch="1">
+		<btn_advanced x="156" y="322" width="110" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_gamepad_setup</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -862,7 +862,7 @@
             </scroll_view>
         </key_binding_gamepad>
 
-		<btn_default x="270" y="322" width="86" height="24" stretch="1">
+		<btn_default x="270" y="322" width="86" height="24" stretch="1" accel="ui_action_2">
             <text align="c" font="letterica16">ui_mm_default</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
@@ -870,7 +870,7 @@
 			</text_color>
         </btn_default>
 		
-		<btn_controls x="150" y="322" width="116" height="24" stretch="1">
+		<btn_controls x="150" y="322" width="116" height="24" stretch="1" accel="ui_action_1">
             <text align="c" font="letterica16">ui_mm_keyboard_setup</text>
             <texture>ui_inGame2_button</texture>
 			<text_color>
diff --git a/res/gamedata/configs/ui/ui_mm_save_dlg.xml b/res/gamedata/configs/ui/ui_mm_save_dlg.xml
index b802cbb5e92..51672339ec6 100644
--- a/res/gamedata/configs/ui/ui_mm_save_dlg.xml
+++ b/res/gamedata/configs/ui/ui_mm_save_dlg.xml
@@ -33,17 +33,17 @@
 	    <list x="33" y="110" width="497" height="273" item_height="18" can_select="1">
 		    <font font="letterica16"/>
 	    </list>
-	    <btn_save x="65" y="427" width="135" height="26">
+	    <btn_save x="65" y="427" width="135" height="26" accel="ui_accept">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_save</text>
 	    </btn_save>
-	    <btn_delete x="221" y="427" width="135" height="26">
+	    <btn_delete x="221" y="427" width="135" height="26" accel="ui_action_1">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_delete</text>
 	        <text_color>
 	        </text_color>
 	    </btn_delete>
-	    <btn_cancel x="377" y="427" width="135" height="26">
+	    <btn_cancel x="377" y="427" width="135" height="26" accel="ui_back">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_cancel</text>
 	        <text_color>
diff --git a/res/gamedata/configs/ui/ui_mm_save_dlg_16.xml b/res/gamedata/configs/ui/ui_mm_save_dlg_16.xml
index 0ffd2bd3f13..03f3e0a39af 100644
--- a/res/gamedata/configs/ui/ui_mm_save_dlg_16.xml
+++ b/res/gamedata/configs/ui/ui_mm_save_dlg_16.xml
@@ -39,15 +39,15 @@
 	    <list x="26" y="110" width="417" height="273" item_height="18" can_select="1">
 		    <font font="letterica16"/>
 	    </list>
-	    <btn_save x="54" y="427" width="108" height="26" stretch="1">
+	    <btn_save x="54" y="427" width="108" height="26" stretch="1" accel="ui_accept">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_save</text>
 	    </btn_save>
-	    <btn_delete x="184" y="427" width="108" height="26" stretch="1">
+	    <btn_delete x="184" y="427" width="108" height="26" stretch="1" accel="ui_action_1">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_delete</text>
 	    </btn_delete>
-	    <btn_cancel x="314" y="427" width="108" height="26" stretch="1">
+	    <btn_cancel x="314" y="427" width="108" height="26" stretch="1" accel="ui_back">
 	        <texture>ui_inGame2_Mp_bigbuttone</texture>
 	        <text font="letterica18">ui_mm_cancel</text>
 	    </btn_cancel>
diff --git a/res/gamedata/scripts/ui_load_dialog.script b/res/gamedata/scripts/ui_load_dialog.script
index 5f59f9047bc..5ea4a10e708 100644
--- a/res/gamedata/scripts/ui_load_dialog.script
+++ b/res/gamedata/scripts/ui_load_dialog.script
@@ -319,16 +319,20 @@ function load_dialog:OnButton_del_clicked()
 end
 
 function load_dialog:OnKeyboard(dik, keyboard_action)  --virtual function
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
 	local bind = dik_to_bind(dik)
 	if bind == key_bindings.kQUIT then
 		self:OnButton_back_clicked()
+		return true
 	else
 		if bind == key_bindings.kENTER and keyboard_action == ui_events.WINDOW_KEY_PRESSED then
 			self:OnButton_load_clicked()
+			return true
 		end
 	end
-	return true
+	return false
 end
 
 function load_dialog:AddItemToList(file_name, date_time)
diff --git a/res/gamedata/scripts/ui_main_menu.script b/res/gamedata/scripts/ui_main_menu.script
index db6b0443923..1c573a269bf 100644
--- a/res/gamedata/scripts/ui_main_menu.script
+++ b/res/gamedata/scripts/ui_main_menu.script
@@ -328,7 +328,10 @@ function main_menu:Dispatch(cmd, param)  --virtual function
 end
 
 function main_menu:OnKeyboard(dik, keyboard_action)  --virtual function
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
+
 	local bind = dik_to_bind(dik)
 	local console = get_console()
 
diff --git a/res/gamedata/scripts/ui_mm_mp_gamespy.script b/res/gamedata/scripts/ui_mm_mp_gamespy.script
index 6859b660e9a..d4e3927953d 100644
--- a/res/gamedata/scripts/ui_mm_mp_gamespy.script
+++ b/res/gamedata/scripts/ui_mm_mp_gamespy.script
@@ -393,7 +393,9 @@ function gamespy_page:OnMsgNo()
 end
 
 function gamespy_page:OnKeyboard(dik, keyboard_action)
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
 
 	local bind = dik_to_bind(dik)
 	local console = get_console()
@@ -401,12 +403,15 @@ function gamespy_page:OnKeyboard(dik, keyboard_action)
 	if keyboard_action == ui_events.WINDOW_KEY_RELEASED then
 		if dik == DIK_keys.DIK_LCONTROL then
 			ctrl = false
+			return true
 		end
 	elseif keyboard_action == ui_events.WINDOW_KEY_PRESSED then
 		if dik == DIK_keys.DIK_LCONTROL then
 			ctrl = true
+			return true
 		elseif bind == key_bindings.kQUIT then
 			self:OnBtnCancel()
+			return true
 		elseif bind == key_bindings.kSCORES then
 			if(ctrl) then
 	            if(self.active_page=="login_page") then
@@ -414,10 +419,11 @@ function gamespy_page:OnKeyboard(dik, keyboard_action)
 				else
 					self:OnBtnLogin()
 				end
+				return true
 			end
 		end
 	end
-	return true
+	return false
 end
 
 function gamespy_page:OnEditLPEmailChanged()
diff --git a/res/gamedata/scripts/ui_mm_mp_localnet.script b/res/gamedata/scripts/ui_mm_mp_localnet.script
index 28ce48cffd9..8fc51e7a24d 100644
--- a/res/gamedata/scripts/ui_mm_mp_localnet.script
+++ b/res/gamedata/scripts/ui_mm_mp_localnet.script
@@ -103,7 +103,9 @@ function localnet_page:OnEditLPNicknameChanged()
 end
 
 function localnet_page:OnKeyboard(dik, keyboard_action)
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
 
 	local bind = dik_to_bind(dik)
 	local console = get_console()
@@ -111,8 +113,9 @@ function localnet_page:OnKeyboard(dik, keyboard_action)
 	if keyboard_action == ui_events.WINDOW_KEY_PRESSED then
 		if bind == key_bindings.kQUIT then
 			self:OnBtnCancel()
+			return true
 		end
 	end
 	
-	return true
+	return false
 end
\ No newline at end of file
diff --git a/res/gamedata/scripts/ui_mm_opt_main.script b/res/gamedata/scripts/ui_mm_opt_main.script
index 66e85e0f5c0..5508f79203b 100644
--- a/res/gamedata/scripts/ui_mm_opt_main.script
+++ b/res/gamedata/scripts/ui_mm_opt_main.script
@@ -367,10 +367,12 @@ function options_dialog:OnKeyboard(dik, keyboard_action)
 				if self.dlg_video_adv:IsShown() then
 					self.dlg_video_adv:Show	(false)
 					self.dlg_video:Show		(true)
+					return true
 				else
 					self.owner:ShowDialog(true)
 					self:HideDialog()
 					self.owner:Show(true)
+					return true
 				end
 			end
 
diff --git a/res/gamedata/scripts/ui_mp_main.script b/res/gamedata/scripts/ui_mp_main.script
index 73a401b0862..c93af4f4b76 100644
--- a/res/gamedata/scripts/ui_mp_main.script
+++ b/res/gamedata/scripts/ui_mp_main.script
@@ -618,7 +618,9 @@ function mp_main:OnBtn_Join()
 end
 
 function mp_main:OnKeyboard(dik, keyboard_action)
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
 
 	local bind = dik_to_bind(dik)
 	local console = get_console()
@@ -628,10 +630,11 @@ function mp_main:OnKeyboard(dik, keyboard_action)
 			self.owner:ShowDialog(true) --new(show main window)
 			self:HideDialog()
 			self.owner:Show(true)
+			return true
 		end
 	end
 
-	return true
+	return false
 end
 
 function mp_main:Update()
diff --git a/res/gamedata/scripts/ui_numpad.script b/res/gamedata/scripts/ui_numpad.script
index 6d16cda0730..e7c54d67a19 100644
--- a/res/gamedata/scripts/ui_numpad.script
+++ b/res/gamedata/scripts/ui_numpad.script
@@ -158,43 +158,60 @@ function numpad:OnButton_OK_clicked()
 end
 
 function numpad:OnKeyboard(dik, keyboard_action)  --virtual function
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
+
 	local bind = dik_to_bind(dik)
 
 	if keyboard_action == ui_events.WINDOW_KEY_PRESSED then
 		if bind == key_bindings.kQUIT then
 			self:HideDialog()
+			return true
 		elseif bind == key_bindings.kENTER or dik == DIK_keys.DIK_RETURN or dik == DIK_keys.DIK_NUMPADENTER then
 			self:OnButton_OK_clicked()
+			return true
 		end
 
 		if dik == DIK_keys.DIK_0 or dik == DIK_keys.DIK_NUMPAD0 then
 			self:AddNumber(0)
+			return true
 		elseif dik == DIK_keys.DIK_1 or dik == DIK_keys.DIK_NUMPAD1 then
 			self:AddNumber(1)
+			return true
 		elseif dik == DIK_keys.DIK_2 or dik == DIK_keys.DIK_NUMPAD2 then
 			self:AddNumber(2)
+			return true
 		elseif dik == DIK_keys.DIK_3 or dik == DIK_keys.DIK_NUMPAD3 then
 			self:AddNumber(3)
+			return true
 		elseif dik == DIK_keys.DIK_4 or dik == DIK_keys.DIK_NUMPAD4 then
 			self:AddNumber(4)
+			return true
 		elseif dik == DIK_keys.DIK_5 or dik == DIK_keys.DIK_NUMPAD5 then
 			self:AddNumber(5)
+			return true
 		elseif dik == DIK_keys.DIK_6 or dik == DIK_keys.DIK_NUMPAD6 then
 			self:AddNumber(6)
+			return true
 		elseif dik == DIK_keys.DIK_7 or dik == DIK_keys.DIK_NUMPAD7 then
 			self:AddNumber(7)
+			return true
 		elseif dik == DIK_keys.DIK_8 or dik == DIK_keys.DIK_NUMPAD8 then
 			self:AddNumber(8)
+			return true
 		elseif dik == DIK_keys.DIK_9 or dik == DIK_keys.DIK_NUMPAD9 then
 			self:AddNumber(9)
+			return true
 		elseif dik == DIK_keys.DIK_BACK then
 			self:OnButton_backspace_clicked()
+			return true
 		elseif dik == DIK_keys.DIK_DELETE or dik == DIK_keys.DIK_NUMPADCOMMA then
 			self:OnButton_c_clicked()
+			return true
 		end
 	end
 
-	return true
+	return false
 end
 
diff --git a/res/gamedata/scripts/ui_save_dialog.script b/res/gamedata/scripts/ui_save_dialog.script
index 4df644bba93..c7fb3075e91 100644
--- a/res/gamedata/scripts/ui_save_dialog.script
+++ b/res/gamedata/scripts/ui_save_dialog.script
@@ -200,16 +200,20 @@ function save_dialog:OnButton_cancel_clicked()
 end
 
 function save_dialog:OnKeyboard(dik, keyboard_action)  --virtual function
-	CUIScriptWnd.OnKeyboard(self,dik,keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
 	local bind = dik_to_bind(dik)
 	if bind == key_bindings.kQUIT then
 		self:OnButton_cancel_clicked()
+		return true
 	else
 		if bind == key_bindings.kENTER and keyboard_action == ui_events.WINDOW_KEY_PRESSED then
 			self:OnButton_ok_clicked()
+			return true
 		end
-   end
-	return true
+	end
+	return false
 end
 
 function save_dialog:AddItemToList(file_name, date_time)
diff --git a/res/gamedata/scripts/ui_sleep_dialog.script b/res/gamedata/scripts/ui_sleep_dialog.script
index a6be142b8a3..c0036b3712e 100644
--- a/res/gamedata/scripts/ui_sleep_dialog.script
+++ b/res/gamedata/scripts/ui_sleep_dialog.script
@@ -137,7 +137,10 @@ function sleep_dialog:OnMessageBoxOk()
 end
 
 function sleep_dialog:OnKeyboard(dik, keyboard_action)
-	CUIScriptWnd.OnKeyboard(self, dik, keyboard_action)
+	if CUIScriptWnd.OnKeyboard(self,dik,keyboard_action) then
+		return true
+	end
+
 	local bind = dik_to_bind(dik)
 
 	if keyboard_action == ui_events.WINDOW_KEY_PRESSED then
diff --git a/src/xrGame/UIDialogHolder.cpp b/src/xrGame/UIDialogHolder.cpp
index a4f024ffb70..cb46f9a4d27 100644
--- a/src/xrGame/UIDialogHolder.cpp
+++ b/src/xrGame/UIDialogHolder.cpp
@@ -570,6 +570,52 @@ bool CDialogHolder::IR_UIOnControllerHold(int dik, float x, float y)
     if (TIR->OnControllerAction(dik, x, y, WINDOW_KEY_HOLD))
         return true;
 
+    if (IsBinded(kUI_MOVE, dik, EKeyContext::UI))
+    {
+        FocusDirection direction = FocusDirection::Same;
+
+        if (fis_zero(y))
+        {
+            if (x < 0)
+                direction = FocusDirection::Left;
+            else
+                direction = FocusDirection::Right;
+        }
+        else if (y < 0)
+        {
+            if (fis_zero(x))
+                direction = FocusDirection::Up;
+            else if (x < 0)
+                direction = FocusDirection::UpperLeft;
+            else
+                direction = FocusDirection::UpperRight;
+        }
+        else
+        {
+            if (fis_zero(x)) // same x
+                direction = FocusDirection::Down;
+            else if (x < 0)
+                direction = FocusDirection::LowerLeft;
+            else
+                direction = FocusDirection::LowerRight;
+        }
+
+        if (direction != FocusDirection::Same)
+        {
+            auto& focus = UI().Focus();
+            const auto focused = focus.GetFocused();
+            const Fvector2 vec = focused ? focused->GetAbsoluteCenterPos() : UI().GetUICursor().GetCursorPosition();
+            const auto [target, direct] = focus.FindClosestFocusable(vec, direction);
+
+            if (target)
+            {
+                focus.SetFocused(target);
+                GetUICursor().WarpToWindow(target, true);
+                return true;
+            }
+        }
+    }
+
     if (!TIR->StopAnyMove() && g_pGameLevel)
     {
         IGameObject* O = Level().CurrentEntity();
diff --git a/src/xrGame/ui/UIDialogWnd.h b/src/xrGame/ui/UIDialogWnd.h
index 97a97cd5d92..e08e14566dc 100644
--- a/src/xrGame/ui/UIDialogWnd.h
+++ b/src/xrGame/ui/UIDialogWnd.h
@@ -25,7 +25,7 @@ class CUIDialogWnd : public CUIWindow
     void SetHolder(CDialogHolder* h) { m_pParentHolder = h; }
 
     virtual bool StopAnyMove() { return true; }
-    virtual bool NeedCursor() const { return pInput->IsCurrentInputTypeKeyboardMouse(); }
+    virtual bool NeedCursor() const { return true; }
     virtual bool NeedCenterCursor() const { return true; }
     virtual bool WorkInPause() const { return m_bWorkInPause; }
     virtual bool Dispatch(int cmd, int param) { return true; }
diff --git a/src/xrGame/ui/UIMMShniaga.cpp b/src/xrGame/ui/UIMMShniaga.cpp
index a166ae1b612..dcc0a38d70f 100644
--- a/src/xrGame/ui/UIMMShniaga.cpp
+++ b/src/xrGame/ui/UIMMShniaga.cpp
@@ -405,8 +405,6 @@ bool CUIMMShniaga::OnKeyboardAction(int dik, EUIMessages keyboard_action)
         switch (action)
         {
         case kUI_ACCEPT:
-            if (WINDOW_KEY_HOLD == keyboard_action)
-                return false;
             OnBtnClick();
             return true;
 
@@ -414,9 +412,15 @@ bool CUIMMShniaga::OnKeyboardAction(int dik, EUIMessages keyboard_action)
             if (m_page != epi_main)
                 ShowMain();
             return true;
+
+        case kUI_MOVE_UP:
+        case kUI_MOVE_DOWN:
+            // CInput sends both 'key hold' and 'key press' during one frame for keyboard (not gamepad)
+            // Prevent double scroll for keyboard
+            // Prevent focus system triggering for gamepad
+            return true;
         } // switch (GetBindedAction(dik))
     }
-    // CInput sends both 'key hold' and 'key press' during one frame, no need to check WINDOW_KEY_PRESSED here
     else if (WINDOW_KEY_HOLD == keyboard_action)
     {
         switch (action)
diff --git a/src/xrUICore/ListBox/UIListBoxItem.cpp b/src/xrUICore/ListBox/UIListBoxItem.cpp
index 833e91e4b59..60ce528a033 100644
--- a/src/xrUICore/ListBox/UIListBoxItem.cpp
+++ b/src/xrUICore/ListBox/UIListBoxItem.cpp
@@ -9,6 +9,12 @@ CUIListBoxItem::CUIListBoxItem(float height)
 {
     SetHeight(height);
     m_text = AddTextField("", 10.0f);
+    UI().Focus().RegisterFocusable(this);
+}
+
+CUIListBoxItem::~CUIListBoxItem()
+{
+    UI().Focus().UnregisterFocusable(this);
 }
 
 void CUIListBoxItem::SetTAG(u32 value) { tag = value; }
diff --git a/src/xrUICore/ListBox/UIListBoxItem.h b/src/xrUICore/ListBox/UIListBoxItem.h
index 9cd36abb7dd..438a6085e22 100644
--- a/src/xrUICore/ListBox/UIListBoxItem.h
+++ b/src/xrUICore/ListBox/UIListBoxItem.h
@@ -9,6 +9,7 @@ class XRUICORE_API CUIListBoxItem : public CUIFrameLineWnd, public CUISelectable
 
 public:
     CUIListBoxItem(float height);
+    ~CUIListBoxItem() override;
 
     virtual void Draw();
     virtual bool OnMouseDown(int mouse_btn);
diff --git a/src/xrUICore/ListWnd/UIListItem.cpp b/src/xrUICore/ListWnd/UIListItem.cpp
index ee95a87fe79..67e614291dc 100644
--- a/src/xrUICore/ListWnd/UIListItem.cpp
+++ b/src/xrUICore/ListWnd/UIListItem.cpp
@@ -13,10 +13,12 @@ CUIListItem::CUIListItem()
     m_bHighlightText = false;
     m_iGroupID = -1;
     SetAutoDelete(true);
+    UI().Focus().RegisterFocusable(this);
 }
 
 CUIListItem::~CUIListItem()
 {
+    UI().Focus().UnregisterFocusable(this);
 }
 
 void CUIListItem::InitListItem(Fvector2 pos, Fvector2 size)