From ecddd1a7143401c4edacc18e5fe84c4db35bda06 Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 01:05:54 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix(settings):=20=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E9=BA=A6=E5=85=8B=E9=A3=8E=E7=8B=AC=E7=AB=8B=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/limelight/preferences/StreamSettings.kt  | 1 +
 app/src/main/res/xml/preferences.xml                       | 5 +++++
 .../limelight/preferences/SettingsResourceHygieneTest.kt   | 7 +++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.kt b/app/src/main/java/com/limelight/preferences/StreamSettings.kt
index 3d07efd11f..313c20b546 100644
--- a/app/src/main/java/com/limelight/preferences/StreamSettings.kt
+++ b/app/src/main/java/com/limelight/preferences/StreamSettings.kt
@@ -161,6 +161,7 @@ class StreamSettings : AppCompatActivity() {
                 "category_screen_position" -> R.drawable.phc_video_camera
                 "category_display_behavior" -> R.drawable.phc_perf_resolution
                 "category_audio_settings" -> R.drawable.phc_audio
+                "category_microphone_settings" -> R.drawable.ic_mic_gm
                 "category_gamepad_settings" -> R.drawable.phc_gamepad
                 "category_input_settings" -> R.drawable.phc_keyboard
                 "category_onscreen_controls" -> R.drawable.phc_game_controller
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 657afb8f8d..5c7e198dd4 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -597,6 +597,11 @@
             android:entries="@array/audio_vibration_scene_names"
             android:entryValues="@array/audio_vibration_scene_values"
             android:defaultValue="0" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/category_microphone_settings"
+        android:key="category_microphone_settings"
+        android:layout="@layout/preference_category_material"
+        app:initialExpandedChildrenCount="4">
         <CheckBoxPreference
             android:key="checkbox_enable_mic"
             android:title="@string/title_checkbox_enable_mic"
diff --git a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
index 687ece7cbf..4ab004e2af 100644
--- a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
+++ b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
@@ -118,7 +118,7 @@ class SettingsResourceHygieneTest {
     }
 
     @Test
-    fun consolidatedCategoriesKeepEveryPreferenceKey() {
+    fun settingsCategoriesKeepEveryPreferenceKey() {
         val preferences = parse(File(resourceDir, "xml/preferences.xml"))
         val categories = preferences.documentElement
             .getElementsByTagName("PreferenceCategory")
@@ -126,7 +126,6 @@ class SettingsResourceHygieneTest {
             .associateBy { it.getAttributeNS(ANDROID_NAMESPACE, "key") }
 
         setOf(
-            "category_microphone_settings",
             "category_enhanced_touch",
             "category_float_ball",
             "category_connection_settings",
@@ -151,7 +150,7 @@ class SettingsResourceHygieneTest {
                 "list_float_ball_double_click_action",
                 "list_float_ball_long_click_action",
             ),
-            "category_audio_settings" to setOf(
+            "category_microphone_settings" to setOf(
                 "checkbox_enable_mic",
                 "list_mic_menu_action_mode",
                 "checkbox_show_mic_button",
@@ -189,7 +188,7 @@ class SettingsResourceHygieneTest {
                 .toSet()
             expectedKeys.forEach { preferenceKey ->
                 assertTrue(
-                    "$preferenceKey was not moved under $categoryKey",
+                    "$preferenceKey is missing from $categoryKey",
                     preferenceKey in actualKeys,
                 )
             }

From b8bf7c3701c5a2a124fbd0f61625b2d8ddca577c Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 01:11:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix(settings):=20=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F=E6=96=87?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml | 2 +-
 app/src/main/res/values/strings.xml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3e1fac971a..b4ee7cdcb6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -488,7 +488,7 @@
     <string name="title_checkbox_resume_stream">自动恢复串流</string>
     <string name="summary_checkbox_resume_stream">当从后台切回Moonlight时，自动恢复串流会话。</string>
     <string name="category_host_settings">主机</string>
-    <string name="title_checkbox_enable_sops">让游戏设置匹配串流规格</string>
+    <string name="title_checkbox_enable_sops">自动优化游戏</string>
     <string name="summary_checkbox_enable_sops">允许兼容的主机软件根据请求的串流分辨率和质量调整受支持游戏；更改发生在主机上。</string>
     <string name="title_checkbox_host_audio">同时在主机播放声音</string>
     <string name="summary_checkbox_host_audio">在主机和本设备上同时输出串流音频。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1c0b82ccb7..3489cd17cd 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -276,7 +276,7 @@
     <string name="title_checkbox_small_icon_mode">使用小封面</string>
     <string name="summary_checkbox_small_icon_mode">使用小圖示以在螢幕上顯示更多應用程式</string>
     <string name="category_host_settings">主機</string>
-    <string name="title_checkbox_enable_sops">讓遊戲設定符合串流規格</string>
+    <string name="title_checkbox_enable_sops">自動最佳化遊戲</string>
     <string name="summary_checkbox_enable_sops">允許相容的主機軟體依照所請求的串流解析度與品質調整支援的遊戲；變更發生在主機上。</string>
     <string name="title_checkbox_host_audio">在電腦上播放音訊</string>
     <string name="summary_checkbox_host_audio">在電腦和本裝置同時輸出音訊</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2bded2ad15..66bf52eed5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -630,7 +630,7 @@
     <string name="summary_checkbox_resume_stream">Automatically resume the stream when returning to Moonlight from the background</string>
 
     <string name="category_host_settings">Host</string>
-    <string name="title_checkbox_enable_sops">Match game settings to the stream</string>
+    <string name="title_checkbox_enable_sops">Optimize game settings</string>
     <string name="summary_checkbox_enable_sops">Allow compatible host software to adjust supported games for the requested stream resolution and quality. Changes are made on the host.</string>
     <string name="title_checkbox_host_audio">Play audio on PC</string>
     <string name="summary_checkbox_host_audio">Play audio from the computer and this device</string>

From fd44f02c32dbb413e8bcc1ad49862f09b735c91d Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 01:13:29 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix(settings):=20=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=8E=9F=E6=9C=89=20SOPS=20=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b4ee7cdcb6..13f8f3b065 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -488,7 +488,7 @@
     <string name="title_checkbox_resume_stream">自动恢复串流</string>
     <string name="summary_checkbox_resume_stream">当从后台切回Moonlight时，自动恢复串流会话。</string>
     <string name="category_host_settings">主机</string>
-    <string name="title_checkbox_enable_sops">自动优化游戏</string>
+    <string name="title_checkbox_enable_sops">自动优化主机设置</string>
     <string name="summary_checkbox_enable_sops">允许兼容的主机软件根据请求的串流分辨率和质量调整受支持游戏；更改发生在主机上。</string>
     <string name="title_checkbox_host_audio">同时在主机播放声音</string>
     <string name="summary_checkbox_host_audio">在主机和本设备上同时输出串流音频。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3489cd17cd..f1463bdc58 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -276,7 +276,7 @@
     <string name="title_checkbox_small_icon_mode">使用小封面</string>
     <string name="summary_checkbox_small_icon_mode">使用小圖示以在螢幕上顯示更多應用程式</string>
     <string name="category_host_settings">主機</string>
-    <string name="title_checkbox_enable_sops">自動最佳化遊戲</string>
+    <string name="title_checkbox_enable_sops">最佳化遊戲設定</string>
     <string name="summary_checkbox_enable_sops">允許相容的主機軟體依照所請求的串流解析度與品質調整支援的遊戲；變更發生在主機上。</string>
     <string name="title_checkbox_host_audio">在電腦上播放音訊</string>
     <string name="summary_checkbox_host_audio">在電腦和本裝置同時輸出音訊</string>

From 08d921f6f4547ed14b16847cfaaf11f829a3e718 Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 01:20:42 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix(settings):=20=E5=B0=86=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=20HDR=20=E5=BD=92=E5=85=A5=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../limelight/preferences/StreamSettings.kt   |   5 +-
 app/src/main/res/xml/preferences.xml          | 104 +++++++++---------
 .../SettingsResourceHygieneTest.kt            |  11 ++
 3 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.kt b/app/src/main/java/com/limelight/preferences/StreamSettings.kt
index 313c20b546..7b560dfada 100644
--- a/app/src/main/java/com/limelight/preferences/StreamSettings.kt
+++ b/app/src/main/java/com/limelight/preferences/StreamSettings.kt
@@ -158,7 +158,6 @@ class StreamSettings : AppCompatActivity() {
         private fun getIconForCategory(key: String): Int {
             return when (key) {
                 "category_basic_settings" -> R.drawable.phc_settings
-                "category_screen_position" -> R.drawable.phc_video_camera
                 "category_display_behavior" -> R.drawable.phc_perf_resolution
                 "category_audio_settings" -> R.drawable.phc_audio
                 "category_microphone_settings" -> R.drawable.ic_mic_gm
@@ -3547,7 +3546,7 @@ class StreamSettings : AppCompatActivity() {
             // Remove HDR preference for devices below Nougat
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                 LimeLog.info("Excluding HDR toggle based on OS")
-                val category = findPreference<PreferenceCategory>("category_screen_position")!!
+                val category = findPreference<PreferenceCategory>("category_advanced_features")!!
                 // 必须先移除依赖项，再移除被依赖的项，否则会崩溃
                 val hdrModePref = findPreference<Preference>("list_hdr_mode")
                 if (hdrModePref != null) {
@@ -3581,7 +3580,7 @@ class StreamSettings : AppCompatActivity() {
                 val foundHlg = hdrTypeSupport.hasHlg
                 val foundDolbyVision = hdrTypeSupport.hasDolbyVision
 
-                val category = findPreference<PreferenceCategory>("category_screen_position")!!
+                val category = findPreference<PreferenceCategory>("category_advanced_features")!!
                 val hdrPref = findPreference<CheckBoxPreference>("checkbox_enable_hdr")
                 val hdrHighBrightnessPref = findPreference<CheckBoxPreference>("checkbox_enable_hdr_high_brightness")
                 val hdrBrightnessOverridePref = findPreference<CheckBoxPreference>("checkbox_hdr_brightness_override")
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 5c7e198dd4..b03da0f2f8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -111,11 +111,60 @@
             android:title="@string/title_force_mtk_max_operating_rate"
             android:summary="@string/summary_force_mtk_max_operating_rate"
             android:defaultValue="false" />
+        <ListPreference
+            android:key="video_format"
+            android:title="@string/title_video_format"
+            android:entries="@array/video_format_names"
+            android:entryValues="@array/video_format_values"
+            android:summary="@string/summary_video_format"
+            android:defaultValue="auto" />
+        <CheckBoxPreference
+            android:key="checkbox_enable_hdr"
+            android:title="@string/title_enable_hdr"
+            android:summary="@string/summary_enable_hdr"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_enable_hdr_high_brightness"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_enable_hdr_high_brightness"
+            android:summary="@string/summary_enable_hdr_high_brightness"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_hdr_brightness_override"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_hdr_brightness_override"
+            android:summary="@string/summary_hdr_brightness_override"
+            android:defaultValue="false" />
+        <com.limelight.preferences.SeekBarPreference
+            android:key="seekbar_hdr_peak_brightness_nits"
+            android:dependency="checkbox_hdr_brightness_override"
+            android:dialogMessage="@string/summary_hdr_peak_brightness_nits"
+            seekbar:min="300"
+            android:max="4000"
+            android:defaultValue="1000"
+            seekbar:step="50"
+            seekbar:keyStep="100"
+            seekbar:divisor="1"
+            android:summary="@string/summary_hdr_peak_brightness_nits"
+            android:text="@string/suffix_hdr_peak_brightness_nits"
+            android:title="@string/title_hdr_peak_brightness_nits" />
+        <ListPreference
+            android:key="list_hdr_mode"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_hdr_mode"
+            android:summary="@string/summary_hdr_mode"
+            android:entries="@array/hdr_mode_entries"
+            android:entryValues="@array/hdr_mode_values"
+            android:defaultValue="1" />
         <CheckBoxPreference
             android:key="checkbox_full_range"
             android:title="@string/title_full_range"
             android:summary="@string/summary_full_range"
             android:defaultValue="false" />
+        <Preference
+            android:key="capability_diagnostic"
+            android:title="@string/title_capability_diagnostic"
+            android:summary="@string/summary_capability_diagnostic" />
 
     </PreferenceCategory>
     <!-- Runtime gating is enforced again in Game before capture starts. -->
@@ -262,61 +311,6 @@
             android:summary="@string/summary_enable_stun"
             android:defaultValue="false"/>
     </PreferenceCategory>
-    <PreferenceCategory
-        android:key="category_screen_position"
-        android:title="@string/category_screen_position_settings"
-        android:icon="@drawable/ic_screen_position"
-        android:layout="@layout/preference_category_material">
-        <ListPreference
-            android:key="video_format"
-            android:title="@string/title_video_format"
-            android:entries="@array/video_format_names"
-            android:entryValues="@array/video_format_values"
-            android:summary="@string/summary_video_format"
-            android:defaultValue="auto" />
-        <CheckBoxPreference
-            android:key="checkbox_enable_hdr"
-            android:title="@string/title_enable_hdr"
-            android:summary="@string/summary_enable_hdr"
-            android:defaultValue="false" />
-        <CheckBoxPreference
-            android:key="checkbox_enable_hdr_high_brightness"
-            android:dependency="checkbox_enable_hdr"
-            android:title="@string/title_enable_hdr_high_brightness"
-            android:summary="@string/summary_enable_hdr_high_brightness"
-            android:defaultValue="false" />
-        <CheckBoxPreference
-            android:key="checkbox_hdr_brightness_override"
-            android:dependency="checkbox_enable_hdr"
-            android:title="@string/title_hdr_brightness_override"
-            android:summary="@string/summary_hdr_brightness_override"
-            android:defaultValue="false" />
-        <com.limelight.preferences.SeekBarPreference
-            android:key="seekbar_hdr_peak_brightness_nits"
-            android:dependency="checkbox_hdr_brightness_override"
-            android:dialogMessage="@string/summary_hdr_peak_brightness_nits"
-            seekbar:min="300"
-            android:max="4000"
-            android:defaultValue="1000"
-            seekbar:step="50"
-            seekbar:keyStep="100"
-            seekbar:divisor="1"
-            android:summary="@string/summary_hdr_peak_brightness_nits"
-            android:text="@string/suffix_hdr_peak_brightness_nits"
-            android:title="@string/title_hdr_peak_brightness_nits" />
-        <ListPreference
-            android:key="list_hdr_mode"
-            android:dependency="checkbox_enable_hdr"
-            android:title="@string/title_hdr_mode"
-            android:summary="@string/summary_hdr_mode"
-            android:entries="@array/hdr_mode_entries"
-            android:entryValues="@array/hdr_mode_values"
-            android:defaultValue="1" />
-        <Preference
-            android:key="capability_diagnostic"
-            android:title="@string/title_capability_diagnostic"
-            android:summary="@string/summary_capability_diagnostic" />
-    </PreferenceCategory>
     <PreferenceCategory
         android:key="category_display_behavior"
         android:title="@string/category_display_behavior"
diff --git a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
index 4ab004e2af..e3d741c09f 100644
--- a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
+++ b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
@@ -126,6 +126,7 @@ class SettingsResourceHygieneTest {
             .associateBy { it.getAttributeNS(ANDROID_NAMESPACE, "key") }
 
         setOf(
+            "category_screen_position",
             "category_enhanced_touch",
             "category_float_ball",
             "category_connection_settings",
@@ -134,6 +135,16 @@ class SettingsResourceHygieneTest {
         }
 
         val expectedKeysByCategory = mapOf(
+            "category_advanced_features" to setOf(
+                "video_format",
+                "checkbox_enable_hdr",
+                "checkbox_enable_hdr_high_brightness",
+                "checkbox_hdr_brightness_override",
+                "seekbar_hdr_peak_brightness_nits",
+                "list_hdr_mode",
+                "checkbox_full_range",
+                "capability_diagnostic",
+            ),
             "category_host_settings" to setOf(
                 "list_background_stream_behavior",
                 "list_quit_behavior",

From 067019a8ddb51b15ad22f6a804089080d1e651c4 Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 01:26:07 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix(settings):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../limelight/preferences/StreamSettings.kt   |   5 +-
 app/src/main/res/xml/preferences.xml          | 121 ++++++++++--------
 .../SettingsResourceHygieneTest.kt            |  19 ++-
 3 files changed, 86 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.kt b/app/src/main/java/com/limelight/preferences/StreamSettings.kt
index 7b560dfada..313c20b546 100644
--- a/app/src/main/java/com/limelight/preferences/StreamSettings.kt
+++ b/app/src/main/java/com/limelight/preferences/StreamSettings.kt
@@ -158,6 +158,7 @@ class StreamSettings : AppCompatActivity() {
         private fun getIconForCategory(key: String): Int {
             return when (key) {
                 "category_basic_settings" -> R.drawable.phc_settings
+                "category_screen_position" -> R.drawable.phc_video_camera
                 "category_display_behavior" -> R.drawable.phc_perf_resolution
                 "category_audio_settings" -> R.drawable.phc_audio
                 "category_microphone_settings" -> R.drawable.ic_mic_gm
@@ -3546,7 +3547,7 @@ class StreamSettings : AppCompatActivity() {
             // Remove HDR preference for devices below Nougat
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                 LimeLog.info("Excluding HDR toggle based on OS")
-                val category = findPreference<PreferenceCategory>("category_advanced_features")!!
+                val category = findPreference<PreferenceCategory>("category_screen_position")!!
                 // 必须先移除依赖项，再移除被依赖的项，否则会崩溃
                 val hdrModePref = findPreference<Preference>("list_hdr_mode")
                 if (hdrModePref != null) {
@@ -3580,7 +3581,7 @@ class StreamSettings : AppCompatActivity() {
                 val foundHlg = hdrTypeSupport.hasHlg
                 val foundDolbyVision = hdrTypeSupport.hasDolbyVision
 
-                val category = findPreference<PreferenceCategory>("category_advanced_features")!!
+                val category = findPreference<PreferenceCategory>("category_screen_position")!!
                 val hdrPref = findPreference<CheckBoxPreference>("checkbox_enable_hdr")
                 val hdrHighBrightnessPref = findPreference<CheckBoxPreference>("checkbox_enable_hdr_high_brightness")
                 val hdrBrightnessOverridePref = findPreference<CheckBoxPreference>("checkbox_hdr_brightness_override")
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b03da0f2f8..9619c196cf 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -7,6 +7,7 @@
 
     <PreferenceCategory android:title="@string/category_basic_settings"
         android:key="category_basic_settings"
+        android:order="0"
         android:layout="@layout/preference_category_material">
         <ListPreference
             android:key="list_resolution"
@@ -52,6 +53,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_advanced_features"
         android:key="category_advanced_features"
+        android:order="4"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="6">
         <CheckBoxPreference
@@ -111,65 +113,11 @@
             android:title="@string/title_force_mtk_max_operating_rate"
             android:summary="@string/summary_force_mtk_max_operating_rate"
             android:defaultValue="false" />
-        <ListPreference
-            android:key="video_format"
-            android:title="@string/title_video_format"
-            android:entries="@array/video_format_names"
-            android:entryValues="@array/video_format_values"
-            android:summary="@string/summary_video_format"
-            android:defaultValue="auto" />
-        <CheckBoxPreference
-            android:key="checkbox_enable_hdr"
-            android:title="@string/title_enable_hdr"
-            android:summary="@string/summary_enable_hdr"
-            android:defaultValue="false" />
-        <CheckBoxPreference
-            android:key="checkbox_enable_hdr_high_brightness"
-            android:dependency="checkbox_enable_hdr"
-            android:title="@string/title_enable_hdr_high_brightness"
-            android:summary="@string/summary_enable_hdr_high_brightness"
-            android:defaultValue="false" />
-        <CheckBoxPreference
-            android:key="checkbox_hdr_brightness_override"
-            android:dependency="checkbox_enable_hdr"
-            android:title="@string/title_hdr_brightness_override"
-            android:summary="@string/summary_hdr_brightness_override"
-            android:defaultValue="false" />
-        <com.limelight.preferences.SeekBarPreference
-            android:key="seekbar_hdr_peak_brightness_nits"
-            android:dependency="checkbox_hdr_brightness_override"
-            android:dialogMessage="@string/summary_hdr_peak_brightness_nits"
-            seekbar:min="300"
-            android:max="4000"
-            android:defaultValue="1000"
-            seekbar:step="50"
-            seekbar:keyStep="100"
-            seekbar:divisor="1"
-            android:summary="@string/summary_hdr_peak_brightness_nits"
-            android:text="@string/suffix_hdr_peak_brightness_nits"
-            android:title="@string/title_hdr_peak_brightness_nits" />
-        <ListPreference
-            android:key="list_hdr_mode"
-            android:dependency="checkbox_enable_hdr"
-            android:title="@string/title_hdr_mode"
-            android:summary="@string/summary_hdr_mode"
-            android:entries="@array/hdr_mode_entries"
-            android:entryValues="@array/hdr_mode_values"
-            android:defaultValue="1" />
-        <CheckBoxPreference
-            android:key="checkbox_full_range"
-            android:title="@string/title_full_range"
-            android:summary="@string/summary_full_range"
-            android:defaultValue="false" />
-        <Preference
-            android:key="capability_diagnostic"
-            android:title="@string/title_capability_diagnostic"
-            android:summary="@string/summary_capability_diagnostic" />
-
     </PreferenceCategory>
     <!-- Runtime gating is enforced again in Game before capture starts. -->
     <PreferenceCategory android:title="@string/category_framegen_settings"
         android:key="category_framegen_settings"
+        android:order="5"
         android:layout="@layout/preference_category_material">
         <Preference
             android:key="pref_framegen_pick_lossless_dll"
@@ -228,6 +176,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings"
         android:key="category_host_settings"
+        android:order="2"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="8">
         <CheckBoxPreference
@@ -311,9 +260,71 @@
             android:summary="@string/summary_enable_stun"
             android:defaultValue="false"/>
     </PreferenceCategory>
+    <PreferenceCategory
+        android:key="category_screen_position"
+        android:title="@string/category_screen_position_settings"
+        android:icon="@drawable/ic_screen_position"
+        android:order="1"
+        android:layout="@layout/preference_category_material">
+        <ListPreference
+            android:key="video_format"
+            android:title="@string/title_video_format"
+            android:entries="@array/video_format_names"
+            android:entryValues="@array/video_format_values"
+            android:summary="@string/summary_video_format"
+            android:defaultValue="auto" />
+        <CheckBoxPreference
+            android:key="checkbox_enable_hdr"
+            android:title="@string/title_enable_hdr"
+            android:summary="@string/summary_enable_hdr"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_enable_hdr_high_brightness"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_enable_hdr_high_brightness"
+            android:summary="@string/summary_enable_hdr_high_brightness"
+            android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_hdr_brightness_override"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_hdr_brightness_override"
+            android:summary="@string/summary_hdr_brightness_override"
+            android:defaultValue="false" />
+        <com.limelight.preferences.SeekBarPreference
+            android:key="seekbar_hdr_peak_brightness_nits"
+            android:dependency="checkbox_hdr_brightness_override"
+            android:dialogMessage="@string/summary_hdr_peak_brightness_nits"
+            seekbar:min="300"
+            android:max="4000"
+            android:defaultValue="1000"
+            seekbar:step="50"
+            seekbar:keyStep="100"
+            seekbar:divisor="1"
+            android:summary="@string/summary_hdr_peak_brightness_nits"
+            android:text="@string/suffix_hdr_peak_brightness_nits"
+            android:title="@string/title_hdr_peak_brightness_nits" />
+        <ListPreference
+            android:key="list_hdr_mode"
+            android:dependency="checkbox_enable_hdr"
+            android:title="@string/title_hdr_mode"
+            android:summary="@string/summary_hdr_mode"
+            android:entries="@array/hdr_mode_entries"
+            android:entryValues="@array/hdr_mode_values"
+            android:defaultValue="1" />
+        <CheckBoxPreference
+            android:key="checkbox_full_range"
+            android:title="@string/title_full_range"
+            android:summary="@string/summary_full_range"
+            android:defaultValue="false" />
+        <Preference
+            android:key="capability_diagnostic"
+            android:title="@string/title_capability_diagnostic"
+            android:summary="@string/summary_capability_diagnostic" />
+    </PreferenceCategory>
     <PreferenceCategory
         android:key="category_display_behavior"
         android:title="@string/category_display_behavior"
+        android:order="3"
         android:layout="@layout/preference_category_material">
         <CheckBoxPreference
             android:key="checkbox_enable_pip"
diff --git a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
index e3d741c09f..39198a8e29 100644
--- a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
+++ b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
@@ -2,6 +2,7 @@ package com.limelight.preferences
 
 import java.io.File
 import javax.xml.parsers.DocumentBuilderFactory
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
@@ -126,7 +127,6 @@ class SettingsResourceHygieneTest {
             .associateBy { it.getAttributeNS(ANDROID_NAMESPACE, "key") }
 
         setOf(
-            "category_screen_position",
             "category_enhanced_touch",
             "category_float_ball",
             "category_connection_settings",
@@ -135,7 +135,7 @@ class SettingsResourceHygieneTest {
         }
 
         val expectedKeysByCategory = mapOf(
-            "category_advanced_features" to setOf(
+            "category_screen_position" to setOf(
                 "video_format",
                 "checkbox_enable_hdr",
                 "checkbox_enable_hdr_high_brightness",
@@ -190,6 +190,21 @@ class SettingsResourceHygieneTest {
             ),
         )
 
+        listOf(
+            "category_basic_settings",
+            "category_screen_position",
+            "category_host_settings",
+            "category_display_behavior",
+            "category_advanced_features",
+            "category_framegen_settings",
+        ).forEachIndexed { order, categoryKey ->
+            assertEquals(
+                "Unexpected sidebar order for $categoryKey",
+                order.toString(),
+                categories[categoryKey]?.getAttributeNS(ANDROID_NAMESPACE, "order"),
+            )
+        }
+
         expectedKeysByCategory.forEach { (categoryKey, expectedKeys) ->
             val category = categories[categoryKey]
             assertNotNull("Missing target category: $categoryKey", category)

From 43cc10a46669883522acc43351181ae26bf39bca Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 08:36:23 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix(settings):=20=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=AE=8C=E6=95=B4=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/xml/preferences.xml                     | 9 +++++++++
 .../limelight/preferences/SettingsResourceHygieneTest.kt | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 9619c196cf..2c11da371c 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -388,6 +388,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_ui_settings"
         android:key="category_ui_settings"
+        android:order="12"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="9">
         <com.limelight.preferences.LanguagePreference
@@ -532,6 +533,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_audio_settings"
         android:key="category_audio_settings"
+        android:order="6"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="11">
         <ListPreference
@@ -605,6 +607,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_microphone_settings"
         android:key="category_microphone_settings"
+        android:order="7"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="4">
         <CheckBoxPreference
@@ -717,6 +720,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_gamepad_settings"
         android:key="category_gamepad_settings"
+        android:order="8"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="4">
         <Preference
@@ -813,6 +817,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_input_settings"
         android:key="category_input_settings"
+        android:order="9"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="4">
         <ListPreference
@@ -963,6 +968,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_on_screen_controls_settings"
         android:key="category_onscreen_controls"
+        android:order="10"
         android:layout="@layout/preference_category_material">
         <CheckBoxPreference
             android:defaultValue="false"
@@ -1014,6 +1020,7 @@
         android:key="category_crown_features"
         android:title="@string/category_crown_features"
         android:icon="@drawable/ic_enhance"
+        android:order="11"
         android:layout="@layout/preference_category_material">
         <CheckBoxPreference
             android:defaultValue="false"
@@ -1027,6 +1034,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_backup_restore"
         android:key="category_backup_restore"
+        android:order="13"
         android:layout="@layout/preference_category_material"
         app:initialExpandedChildrenCount="5">
         <Preference
@@ -1055,6 +1063,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_help"
         android:key="category_help"
+        android:order="14"
         android:layout="@layout/preference_category_material">
         <!-- <com.limelight.preferences.WebLauncherPreference
             android:title="@string/title_setup_guide"
diff --git a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
index 39198a8e29..61060817d6 100644
--- a/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
+++ b/app/src/test/java/com/limelight/preferences/SettingsResourceHygieneTest.kt
@@ -197,6 +197,15 @@ class SettingsResourceHygieneTest {
             "category_display_behavior",
             "category_advanced_features",
             "category_framegen_settings",
+            "category_audio_settings",
+            "category_microphone_settings",
+            "category_gamepad_settings",
+            "category_input_settings",
+            "category_onscreen_controls",
+            "category_crown_features",
+            "category_ui_settings",
+            "category_backup_restore",
+            "category_help",
         ).forEachIndexed { order, categoryKey ->
             assertEquals(
                 "Unexpected sidebar order for $categoryKey",

From e0c4817965459479a726118fbe4f6f30be8179e4 Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Fri, 28 Aug 2026 08:50:20 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix(gamemenu):=20=E5=B0=8F=E5=B1=8F?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=B9=E5=BC=8F=E5=88=86=E4=B8=A4=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GameMenuControllerLayoutFocusTest.kt      |  15 +-
 .../java/com/limelight/gamemenu/GameMenu.kt   |  10 +-
 .../com/limelight/gamemenu/GameMenuOptions.kt | 163 ++++++++++++------
 .../gamemenu/GameMenuLayoutFocusGraphTest.kt  |  29 ++++
 4 files changed, 162 insertions(+), 55 deletions(-)

diff --git a/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt b/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt
index 21f967cb69..25cd34e2b8 100644
--- a/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt
+++ b/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt
@@ -159,7 +159,7 @@ class GameMenuControllerLayoutFocusTest {
     }
 
     @Test
-    fun fiveEnglishSegmentLabelsFitOneRowAtCompactWidth() {
+    fun fiveEnglishSegmentLabelsFitTwoRowsAtCompactWidth() {
         composeTestRule.setContent {
             val density = LocalDensity.current
             CompositionLocalProvider(
@@ -170,11 +170,22 @@ class GameMenuControllerLayoutFocusTest {
                         GameMenu.SegmentOption(label, index == 0, Runnable {})
                     },
                     onSegmentClick = {},
-                    modifier = Modifier.width(164.dp).height(36.dp)
+                    columnCount = 3,
+                    modifier = Modifier.width(164.dp).height(73.dp)
                 )
             }
         }
 
+        val bounds = (0 until 5).map { index ->
+            composeTestRule.onNodeWithTag("inlineSegmentLabel$index", useUnmergedTree = true)
+                .fetchSemanticsNode()
+                .boundsInRoot
+        }
+        assertEquals(bounds[0].top, bounds[1].top, 0.5f)
+        assertEquals(bounds[1].top, bounds[2].top, 0.5f)
+        assertTrue(bounds[3].top > bounds[0].top)
+        assertEquals(bounds[3].top, bounds[4].top, 0.5f)
+
         repeat(5) { index ->
             val layoutResults = mutableListOf<TextLayoutResult>()
             val action = composeTestRule.onNodeWithTag(
diff --git a/app/src/main/java/com/limelight/gamemenu/GameMenu.kt b/app/src/main/java/com/limelight/gamemenu/GameMenu.kt
index 1accf6e091..e977f5b4dd 100644
--- a/app/src/main/java/com/limelight/gamemenu/GameMenu.kt
+++ b/app/src/main/java/com/limelight/gamemenu/GameMenu.kt
@@ -550,7 +550,10 @@ class GameMenu(
             val checked: Boolean,
             val toggleAction: Runnable? = null
         ) : InlineControl
-        data class Segmented(val segments: List<SegmentOption>) : InlineControl
+        data class Segmented(
+            val segments: List<SegmentOption>,
+            val smallScreenColumnCount: Int? = null
+        ) : InlineControl
     }
 
     data class SegmentOption(
@@ -2308,7 +2311,10 @@ class GameMenu(
             isShowIcon = true,
             isKeepDialog = true,
             showChevron = true,
-            inlineControl = InlineControl.Segmented(buildTouchModeSegments(compactLabels = true))
+            inlineControl = InlineControl.Segmented(
+                segments = buildTouchModeSegments(compactLabels = true),
+                smallScreenColumnCount = 3
+            )
         ))
 
         normalOptions.add(MenuOption(
diff --git a/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt b/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt
index f2cd26a3b5..9c3ae03dd0 100644
--- a/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt
+++ b/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt
@@ -40,6 +40,7 @@ import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.Layout
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
@@ -56,6 +57,11 @@ import androidx.compose.ui.unit.sp
 import com.limelight.R
 import com.limelight.ui.theme.AppShapes
 
+private val SEGMENT_ROW_HEIGHT = 36.dp
+private val SEGMENT_ROW_GAP = 1.dp
+private val SEGMENT_COLUMN_GAP = 1.dp
+internal const val LARGE_SCREEN_MIN_SMALLEST_WIDTH_DP = 600
+
 
 @Composable
 internal fun MenuOptionColumn(
@@ -99,6 +105,17 @@ private fun MenuOptionRow(
     val hapticFeedback = LocalGameMenuHapticFeedback.current
     val shape = GameMenuCardShape
     val inlineControl = option.inlineControl
+    val smallestScreenWidthDp = LocalConfiguration.current.smallestScreenWidthDp
+    val segmentedColumnCount = (inlineControl as? GameMenu.InlineControl.Segmented)?.let {
+        responsiveSegmentColumnCount(
+            itemCount = it.segments.size,
+            smallestScreenWidthDp = smallestScreenWidthDp,
+            smallScreenColumnCount = it.smallScreenColumnCount
+        )
+    }
+    val segmentRows = segmentedColumnCount?.let { columns ->
+        segmentedRowCount(inlineControl.segments.size, columns)
+    } ?: 1
     val showChevronAfterTitle = option.showChevron && inlineControl != null
     val hasDedicatedToggleAction = inlineControl is GameMenu.InlineControl.Toggle &&
         inlineControl.toggleAction != null
@@ -244,9 +261,13 @@ private fun MenuOptionRow(
                 InlineSegmentedControl(
                     segments = inlineControl.segments,
                     onSegmentClick = onSegmentClick,
+                    columnCount = segmentedColumnCount ?: inlineControl.segments.size,
                     modifier = Modifier
                         .weight(1f)
-                        .height(36.dp)
+                        .height(
+                            SEGMENT_ROW_HEIGHT * segmentRows +
+                                SEGMENT_ROW_GAP * (segmentRows - 1)
+                        )
                 )
             }
             null -> if (option.showChevron) MenuChevron()
@@ -332,6 +353,7 @@ internal fun InlineToggle(
 internal fun InlineSegmentedControl(
     segments: List<GameMenu.SegmentOption>,
     onSegmentClick: (GameMenu.SegmentOption) -> Unit,
+    columnCount: Int = segments.size.coerceAtLeast(1),
     modifier: Modifier = Modifier
 ) {
     val hapticFeedback = LocalGameMenuHapticFeedback.current
@@ -350,66 +372,105 @@ internal fun InlineSegmentedControl(
             null
         }
     }
-    Row(
+    val boundedColumnCount = columnCount.coerceIn(1, segments.size.coerceAtLeast(1))
+    Column(
         modifier = modifier
             .padding(horizontal = 1.dp)
             .selectableGroup(),
-        horizontalArrangement = Arrangement.spacedBy(1.dp),
-        verticalAlignment = Alignment.CenterVertically
+        verticalArrangement = Arrangement.spacedBy(SEGMENT_ROW_GAP)
     ) {
-        segments.forEachIndexed { index, segment ->
-            val targets = segmentedFocusTargets(segments.size, index, segments.size)
-            val segmentShape = AppShapes.small
-            val background = if (segment.selected) {
-                accent.copy(alpha = 0.12f)
-            } else {
-                Color.Transparent
-            }
-            Box(
-                modifier = Modifier
-                    .weight(1f)
-                    .fillMaxHeight()
-                    .focusRequester(focusRequesters[index])
-                    .segmentedFocusNavigation(targets, focusRequesters)
-                    .clip(segmentShape)
-                    .background(background)
-                    .gamepadFocusOutline(segmentShape)
-                    .selectable(
-                        selected = segment.selected,
-                        role = Role.RadioButton,
-                        onClick = {
-                            hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
-                            onSegmentClick(segment)
-                        }
-                    )
-                    .padding(horizontal = labelHorizontalPadding),
-                contentAlignment = Alignment.Center
+        segments.chunked(boundedColumnCount).forEachIndexed { rowIndex, rowSegments ->
+            Row(
+                modifier = Modifier.weight(1f),
+                horizontalArrangement = Arrangement.spacedBy(SEGMENT_COLUMN_GAP),
+                verticalAlignment = Alignment.CenterVertically
             ) {
-                BasicText(
-                    text = compactSegmentLabel(segment.label),
-                    style = TextStyle(
-                        color = if (segment.selected) {
-                            accent
-                        } else {
-                            colorResource(R.color.game_menu_text_secondary)
-                        },
-                        fontSize = 10.sp,
-                        fontWeight = if (segment.selected) {
-                            FontWeight.Medium
-                        } else {
-                            FontWeight.Normal
-                        }
-                    ),
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    autoSize = labelAutoSize,
-                    modifier = Modifier.testTag("inlineSegmentLabel$index")
-                )
+                rowSegments.forEachIndexed { columnIndex, segment ->
+                    val index = rowIndex * boundedColumnCount + columnIndex
+                    val targets = segmentedFocusTargets(
+                        segments.size,
+                        index,
+                        boundedColumnCount
+                    )
+                    val segmentShape = AppShapes.small
+                    val background = if (segment.selected) {
+                        accent.copy(alpha = 0.12f)
+                    } else {
+                        Color.Transparent
+                    }
+                    Box(
+                        modifier = Modifier
+                            .weight(1f)
+                            .fillMaxHeight()
+                            .focusRequester(focusRequesters[index])
+                            .segmentedFocusNavigation(targets, focusRequesters)
+                            .clip(segmentShape)
+                            .background(background)
+                            .gamepadFocusOutline(segmentShape)
+                            .selectable(
+                                selected = segment.selected,
+                                role = Role.RadioButton,
+                                onClick = {
+                                    hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                                    onSegmentClick(segment)
+                                }
+                            )
+                            .padding(horizontal = labelHorizontalPadding),
+                        contentAlignment = Alignment.Center
+                    ) {
+                        BasicText(
+                            text = compactSegmentLabel(segment.label),
+                            style = TextStyle(
+                                color = if (segment.selected) {
+                                    accent
+                                } else {
+                                    colorResource(R.color.game_menu_text_secondary)
+                                },
+                                fontSize = 10.sp,
+                                fontWeight = if (segment.selected) {
+                                    FontWeight.Medium
+                                } else {
+                                    FontWeight.Normal
+                                }
+                            ),
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
+                            autoSize = labelAutoSize,
+                            modifier = Modifier.testTag("inlineSegmentLabel$index")
+                        )
+                    }
+                }
+                repeat(boundedColumnCount - rowSegments.size) {
+                    Spacer(Modifier.weight(1f))
+                }
             }
         }
     }
 }
 
+internal fun responsiveSegmentColumnCount(
+    itemCount: Int,
+    smallestScreenWidthDp: Int,
+    smallScreenColumnCount: Int?
+): Int {
+    require(itemCount > 0)
+    val requestedSmallColumns = smallScreenColumnCount?.coerceAtLeast(1)
+    return if (
+        requestedSmallColumns != null &&
+        smallestScreenWidthDp < LARGE_SCREEN_MIN_SMALLEST_WIDTH_DP
+    ) {
+        minOf(itemCount, requestedSmallColumns)
+    } else {
+        itemCount
+    }
+}
+
+internal fun segmentedRowCount(itemCount: Int, columnCount: Int): Int {
+    require(itemCount > 0)
+    require(columnCount > 0)
+    return (itemCount + columnCount - 1) / columnCount
+}
+
 internal data class SegmentedFocusTargets(
     val left: Int?,
     val right: Int?,
diff --git a/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt b/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt
index 12eb446537..599277fcad 100644
--- a/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt
+++ b/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt
@@ -71,6 +71,35 @@ class GameMenuLayoutFocusGraphTest {
         )
     }
 
+    @Test
+    fun touchModeSegmentsUseTwoRowsOnPhonesAndOneRowOnLargeScreens() {
+        assertEquals(
+            3,
+            responsiveSegmentColumnCount(
+                itemCount = 5,
+                smallestScreenWidthDp = 411,
+                smallScreenColumnCount = 3
+            )
+        )
+        assertEquals(2, segmentedRowCount(itemCount = 5, columnCount = 3))
+        assertEquals(
+            SegmentedFocusTargets(left = 0, right = 2, up = null, down = 4),
+            segmentedFocusTargets(itemCount = 5, index = 1, columnCount = 3)
+        )
+        assertEquals(
+            SegmentedFocusTargets(left = 3, right = null, up = 1, down = null),
+            segmentedFocusTargets(itemCount = 5, index = 4, columnCount = 3)
+        )
+        assertEquals(
+            5,
+            responsiveSegmentColumnCount(
+                itemCount = 5,
+                smallestScreenWidthDp = LARGE_SCREEN_MIN_SMALLEST_WIDTH_DP,
+                smallScreenColumnCount = 3
+            )
+        )
+    }
+
     @Test
     fun localizedTouchModeShortLabelsFitTheFiveSegmentBudget() {
         val resourceRoot = listOf(File("src/main/res"), File("app/src/main/res"))

From 8d7be20b5d96848b3e303502f6b2de1badb78996 Mon Sep 17 00:00:00 2001
From: Yundi339 <yundi339@foxmail.com>
Date: Mon, 31 Aug 2026 15:55:43 +0800
Subject: [PATCH 8/8] =?UTF-8?q?Revert=20"fix(gamemenu):=20=E5=B0=8F?=
 =?UTF-8?q?=E5=B1=8F=E6=93=8D=E4=BD=9C=E6=96=B9=E5=BC=8F=E5=88=86=E4=B8=A4?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e0c4817965459479a726118fbe4f6f30be8179e4.
---
 .../GameMenuControllerLayoutFocusTest.kt      |  15 +-
 .../java/com/limelight/gamemenu/GameMenu.kt   |  10 +-
 .../com/limelight/gamemenu/GameMenuOptions.kt | 163 ++++++------------
 .../gamemenu/GameMenuLayoutFocusGraphTest.kt  |  29 ----
 4 files changed, 55 insertions(+), 162 deletions(-)

diff --git a/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt b/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt
index 25cd34e2b8..21f967cb69 100644
--- a/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt
+++ b/app/src/androidTest/java/com/limelight/gamemenu/GameMenuControllerLayoutFocusTest.kt
@@ -159,7 +159,7 @@ class GameMenuControllerLayoutFocusTest {
     }
 
     @Test
-    fun fiveEnglishSegmentLabelsFitTwoRowsAtCompactWidth() {
+    fun fiveEnglishSegmentLabelsFitOneRowAtCompactWidth() {
         composeTestRule.setContent {
             val density = LocalDensity.current
             CompositionLocalProvider(
@@ -170,22 +170,11 @@ class GameMenuControllerLayoutFocusTest {
                         GameMenu.SegmentOption(label, index == 0, Runnable {})
                     },
                     onSegmentClick = {},
-                    columnCount = 3,
-                    modifier = Modifier.width(164.dp).height(73.dp)
+                    modifier = Modifier.width(164.dp).height(36.dp)
                 )
             }
         }
 
-        val bounds = (0 until 5).map { index ->
-            composeTestRule.onNodeWithTag("inlineSegmentLabel$index", useUnmergedTree = true)
-                .fetchSemanticsNode()
-                .boundsInRoot
-        }
-        assertEquals(bounds[0].top, bounds[1].top, 0.5f)
-        assertEquals(bounds[1].top, bounds[2].top, 0.5f)
-        assertTrue(bounds[3].top > bounds[0].top)
-        assertEquals(bounds[3].top, bounds[4].top, 0.5f)
-
         repeat(5) { index ->
             val layoutResults = mutableListOf<TextLayoutResult>()
             val action = composeTestRule.onNodeWithTag(
diff --git a/app/src/main/java/com/limelight/gamemenu/GameMenu.kt b/app/src/main/java/com/limelight/gamemenu/GameMenu.kt
index e977f5b4dd..1accf6e091 100644
--- a/app/src/main/java/com/limelight/gamemenu/GameMenu.kt
+++ b/app/src/main/java/com/limelight/gamemenu/GameMenu.kt
@@ -550,10 +550,7 @@ class GameMenu(
             val checked: Boolean,
             val toggleAction: Runnable? = null
         ) : InlineControl
-        data class Segmented(
-            val segments: List<SegmentOption>,
-            val smallScreenColumnCount: Int? = null
-        ) : InlineControl
+        data class Segmented(val segments: List<SegmentOption>) : InlineControl
     }
 
     data class SegmentOption(
@@ -2311,10 +2308,7 @@ class GameMenu(
             isShowIcon = true,
             isKeepDialog = true,
             showChevron = true,
-            inlineControl = InlineControl.Segmented(
-                segments = buildTouchModeSegments(compactLabels = true),
-                smallScreenColumnCount = 3
-            )
+            inlineControl = InlineControl.Segmented(buildTouchModeSegments(compactLabels = true))
         ))
 
         normalOptions.add(MenuOption(
diff --git a/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt b/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt
index 9c3ae03dd0..f2cd26a3b5 100644
--- a/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt
+++ b/app/src/main/java/com/limelight/gamemenu/GameMenuOptions.kt
@@ -40,7 +40,6 @@ import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
@@ -57,11 +56,6 @@ import androidx.compose.ui.unit.sp
 import com.limelight.R
 import com.limelight.ui.theme.AppShapes
 
-private val SEGMENT_ROW_HEIGHT = 36.dp
-private val SEGMENT_ROW_GAP = 1.dp
-private val SEGMENT_COLUMN_GAP = 1.dp
-internal const val LARGE_SCREEN_MIN_SMALLEST_WIDTH_DP = 600
-
 
 @Composable
 internal fun MenuOptionColumn(
@@ -105,17 +99,6 @@ private fun MenuOptionRow(
     val hapticFeedback = LocalGameMenuHapticFeedback.current
     val shape = GameMenuCardShape
     val inlineControl = option.inlineControl
-    val smallestScreenWidthDp = LocalConfiguration.current.smallestScreenWidthDp
-    val segmentedColumnCount = (inlineControl as? GameMenu.InlineControl.Segmented)?.let {
-        responsiveSegmentColumnCount(
-            itemCount = it.segments.size,
-            smallestScreenWidthDp = smallestScreenWidthDp,
-            smallScreenColumnCount = it.smallScreenColumnCount
-        )
-    }
-    val segmentRows = segmentedColumnCount?.let { columns ->
-        segmentedRowCount(inlineControl.segments.size, columns)
-    } ?: 1
     val showChevronAfterTitle = option.showChevron && inlineControl != null
     val hasDedicatedToggleAction = inlineControl is GameMenu.InlineControl.Toggle &&
         inlineControl.toggleAction != null
@@ -261,13 +244,9 @@ private fun MenuOptionRow(
                 InlineSegmentedControl(
                     segments = inlineControl.segments,
                     onSegmentClick = onSegmentClick,
-                    columnCount = segmentedColumnCount ?: inlineControl.segments.size,
                     modifier = Modifier
                         .weight(1f)
-                        .height(
-                            SEGMENT_ROW_HEIGHT * segmentRows +
-                                SEGMENT_ROW_GAP * (segmentRows - 1)
-                        )
+                        .height(36.dp)
                 )
             }
             null -> if (option.showChevron) MenuChevron()
@@ -353,7 +332,6 @@ internal fun InlineToggle(
 internal fun InlineSegmentedControl(
     segments: List<GameMenu.SegmentOption>,
     onSegmentClick: (GameMenu.SegmentOption) -> Unit,
-    columnCount: Int = segments.size.coerceAtLeast(1),
     modifier: Modifier = Modifier
 ) {
     val hapticFeedback = LocalGameMenuHapticFeedback.current
@@ -372,105 +350,66 @@ internal fun InlineSegmentedControl(
             null
         }
     }
-    val boundedColumnCount = columnCount.coerceIn(1, segments.size.coerceAtLeast(1))
-    Column(
+    Row(
         modifier = modifier
             .padding(horizontal = 1.dp)
             .selectableGroup(),
-        verticalArrangement = Arrangement.spacedBy(SEGMENT_ROW_GAP)
+        horizontalArrangement = Arrangement.spacedBy(1.dp),
+        verticalAlignment = Alignment.CenterVertically
     ) {
-        segments.chunked(boundedColumnCount).forEachIndexed { rowIndex, rowSegments ->
-            Row(
-                modifier = Modifier.weight(1f),
-                horizontalArrangement = Arrangement.spacedBy(SEGMENT_COLUMN_GAP),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                rowSegments.forEachIndexed { columnIndex, segment ->
-                    val index = rowIndex * boundedColumnCount + columnIndex
-                    val targets = segmentedFocusTargets(
-                        segments.size,
-                        index,
-                        boundedColumnCount
+        segments.forEachIndexed { index, segment ->
+            val targets = segmentedFocusTargets(segments.size, index, segments.size)
+            val segmentShape = AppShapes.small
+            val background = if (segment.selected) {
+                accent.copy(alpha = 0.12f)
+            } else {
+                Color.Transparent
+            }
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .fillMaxHeight()
+                    .focusRequester(focusRequesters[index])
+                    .segmentedFocusNavigation(targets, focusRequesters)
+                    .clip(segmentShape)
+                    .background(background)
+                    .gamepadFocusOutline(segmentShape)
+                    .selectable(
+                        selected = segment.selected,
+                        role = Role.RadioButton,
+                        onClick = {
+                            hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
+                            onSegmentClick(segment)
+                        }
                     )
-                    val segmentShape = AppShapes.small
-                    val background = if (segment.selected) {
-                        accent.copy(alpha = 0.12f)
-                    } else {
-                        Color.Transparent
-                    }
-                    Box(
-                        modifier = Modifier
-                            .weight(1f)
-                            .fillMaxHeight()
-                            .focusRequester(focusRequesters[index])
-                            .segmentedFocusNavigation(targets, focusRequesters)
-                            .clip(segmentShape)
-                            .background(background)
-                            .gamepadFocusOutline(segmentShape)
-                            .selectable(
-                                selected = segment.selected,
-                                role = Role.RadioButton,
-                                onClick = {
-                                    hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
-                                    onSegmentClick(segment)
-                                }
-                            )
-                            .padding(horizontal = labelHorizontalPadding),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        BasicText(
-                            text = compactSegmentLabel(segment.label),
-                            style = TextStyle(
-                                color = if (segment.selected) {
-                                    accent
-                                } else {
-                                    colorResource(R.color.game_menu_text_secondary)
-                                },
-                                fontSize = 10.sp,
-                                fontWeight = if (segment.selected) {
-                                    FontWeight.Medium
-                                } else {
-                                    FontWeight.Normal
-                                }
-                            ),
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                            autoSize = labelAutoSize,
-                            modifier = Modifier.testTag("inlineSegmentLabel$index")
-                        )
-                    }
-                }
-                repeat(boundedColumnCount - rowSegments.size) {
-                    Spacer(Modifier.weight(1f))
-                }
+                    .padding(horizontal = labelHorizontalPadding),
+                contentAlignment = Alignment.Center
+            ) {
+                BasicText(
+                    text = compactSegmentLabel(segment.label),
+                    style = TextStyle(
+                        color = if (segment.selected) {
+                            accent
+                        } else {
+                            colorResource(R.color.game_menu_text_secondary)
+                        },
+                        fontSize = 10.sp,
+                        fontWeight = if (segment.selected) {
+                            FontWeight.Medium
+                        } else {
+                            FontWeight.Normal
+                        }
+                    ),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    autoSize = labelAutoSize,
+                    modifier = Modifier.testTag("inlineSegmentLabel$index")
+                )
             }
         }
     }
 }
 
-internal fun responsiveSegmentColumnCount(
-    itemCount: Int,
-    smallestScreenWidthDp: Int,
-    smallScreenColumnCount: Int?
-): Int {
-    require(itemCount > 0)
-    val requestedSmallColumns = smallScreenColumnCount?.coerceAtLeast(1)
-    return if (
-        requestedSmallColumns != null &&
-        smallestScreenWidthDp < LARGE_SCREEN_MIN_SMALLEST_WIDTH_DP
-    ) {
-        minOf(itemCount, requestedSmallColumns)
-    } else {
-        itemCount
-    }
-}
-
-internal fun segmentedRowCount(itemCount: Int, columnCount: Int): Int {
-    require(itemCount > 0)
-    require(columnCount > 0)
-    return (itemCount + columnCount - 1) / columnCount
-}
-
 internal data class SegmentedFocusTargets(
     val left: Int?,
     val right: Int?,
diff --git a/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt b/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt
index 599277fcad..12eb446537 100644
--- a/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt
+++ b/app/src/test/java/com/limelight/gamemenu/GameMenuLayoutFocusGraphTest.kt
@@ -71,35 +71,6 @@ class GameMenuLayoutFocusGraphTest {
         )
     }
 
-    @Test
-    fun touchModeSegmentsUseTwoRowsOnPhonesAndOneRowOnLargeScreens() {
-        assertEquals(
-            3,
-            responsiveSegmentColumnCount(
-                itemCount = 5,
-                smallestScreenWidthDp = 411,
-                smallScreenColumnCount = 3
-            )
-        )
-        assertEquals(2, segmentedRowCount(itemCount = 5, columnCount = 3))
-        assertEquals(
-            SegmentedFocusTargets(left = 0, right = 2, up = null, down = 4),
-            segmentedFocusTargets(itemCount = 5, index = 1, columnCount = 3)
-        )
-        assertEquals(
-            SegmentedFocusTargets(left = 3, right = null, up = 1, down = null),
-            segmentedFocusTargets(itemCount = 5, index = 4, columnCount = 3)
-        )
-        assertEquals(
-            5,
-            responsiveSegmentColumnCount(
-                itemCount = 5,
-                smallestScreenWidthDp = LARGE_SCREEN_MIN_SMALLEST_WIDTH_DP,
-                smallScreenColumnCount = 3
-            )
-        )
-    }
-
     @Test
     fun localizedTouchModeShortLabelsFitTheFiveSegmentBudget() {
         val resourceRoot = listOf(File("src/main/res"), File("app/src/main/res"))