diff --git a/src/ColorMC.Gui/App.axaml.cs b/src/ColorMC.Gui/App.axaml.cs index 1cfada0fd..822363ddd 100644 --- 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 index d53cc2e08..4069bf7a0 100644 --- 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();