Merge remote-tracking branch 'origin/zzz-mobile-mode' into filecleanu…

…p-improvement
CollapseLauncher · Dec 20, 2024 · 474422f · 474422f
2 parents 32c6cae + 3cffc8c
commit 474422f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.Ext.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.Ext.cs
@@ -310,8 +310,17 @@ public bool IsGameBoost
 
         public bool IsMobileMode
         {
-            get => Settings?.SettingsCollapseMisc?.LaunchMobileMode ?? false;
-            set => Settings.SettingsCollapseMisc.LaunchMobileMode = value;
+            get
+            {
+                var cSet = Settings?.SettingsCollapseMisc?.LaunchMobileMode ?? false;
+                var gSet = Settings.GeneralData.LocalUILayoutPlatform == 1;
+                return cSet || gSet;
+            }
+            set
+            {
+                Settings.SettingsCollapseMisc.LaunchMobileMode = value;
+                Settings.GeneralData.LocalUILayoutPlatform     = value ? 1 : 3;
+            }
         }
         #endregion
 

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.xaml
@@ -164,9 +164,7 @@
                                             <CheckBox x:Name="MobileModeToggle"
                                                       HorizontalAlignment="Left"
                                                       VerticalAlignment="Center"
-                                                      IsChecked="{x:Bind IsMobileMode, Mode=TwoWay}"
-                                                      IsEnabled="False"
-                                                      Visibility="Collapsed">
+                                                      IsChecked="{x:Bind IsMobileMode, Mode=TwoWay}">
                                                 <TextBlock Text="{x:Bind helper:Locale.Lang._GameSettingsPage.MobileLayout}"
                                                            TextWrapping="Wrap" />
                                             </CheckBox>