up

Coloryr · Aug 8, 2024 · 524c0ca · 524c0ca
1 parent ba45aa9
commit 524c0ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/ColorMC.Gui/App.axaml.cs b/src/ColorMC.Gui/App.axaml.cs
@@ -115,6 +115,11 @@ public override void OnFrameworkInitializationCompleted()
 
         WindowManager.Init(ColorMCGui.RunDir);
 
+        if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
+        {
+            singleViewPlatform.MainView = WindowManager.AllWindow;
+        }
+
         if (ColorMCGui.RunType != RunType.AppBuilder)
         {
             Task.Run(() =>

diff --git a/src/ColorMC.Gui/Manager/ThemeManager.cs b/src/ColorMC.Gui/Manager/ThemeManager.cs
@@ -5,6 +5,8 @@
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.Threading;
+using ColorMC.Core.Objs;
+using ColorMC.Core.Utils;
 using ColorMC.Gui.Objs;
 using ColorMC.Gui.Utils;
 
@@ -72,7 +74,10 @@ public static void Init()
         }
 
         LoadColor();
-        LoadFont();
+        if (SystemInfo.Os != OsType.Android)
+        {
+            LoadFont();
+        }
 
         RgbColor.Load();
         ColorSel.Load();