Center certain dialogs on the screen instead of Studio

psyGamer · Sep 2, 2024 · 60f4ba4 · 60f4ba4
1 parent 3dbc7c9
commit 60f4ba4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/Studio/CelesteStudio/Dialog/SettingsErrorDialog.cs b/Studio/CelesteStudio/Dialog/SettingsErrorDialog.cs
@@ -76,7 +76,7 @@ Celeste Studio {Studio.Version}
         Result = SettingsErrorAction.None;
 
         Load += (_, _) => Studio.Instance.WindowCreationCallback(this);
-        Shown += (_, _) => Location = Studio.Instance.Location + new Point((Studio.Instance.Width - Width) / 2, (Studio.Instance.Height - Height) / 2);
+        Shown += (_, _) => Location = new Point((int)((Screen.WorkingArea.Width - Width) / 2), (int)((Screen.WorkingArea.Height - Height) / 2));
     }
 
     protected override void OnClosing(CancelEventArgs e) {

diff --git a/...lesteStudio/Dialog/PagedMarkdownDialog.cs → ...io/CelesteStudio/Dialog/WhatsNewDialog.cs b/...lesteStudio/Dialog/PagedMarkdownDialog.cs → ...io/CelesteStudio/Dialog/WhatsNewDialog.cs
@@ -62,7 +62,7 @@ Control GenerateContent() {
         Studio.RegisterDialog(this);
 
         Load += (_, _) => Studio.Instance.WindowCreationCallback(this);
-        Shown += (_, _) => Location = Studio.Instance.Location + new Point((Studio.Instance.Width - Width) / 2, (Studio.Instance.Height - Height) / 2);
+        Shown += (_, _) => Location = new Point((int)((Screen.WorkingArea.Width - Width) / 2), (int)((Screen.WorkingArea.Height - Height) / 2));
     }
 
     public static void Show(string title, string markdown) => new WhatsNewDialog(title, markdown).ShowModal();

diff --git a/Studio/CelesteStudio/Migration/Migrator.cs b/Studio/CelesteStudio/Migration/Migrator.cs
@@ -59,6 +59,13 @@ public static void ApplyPreLoadMigrations() {
                 }
             }
         }
+
+        Studio.Instance.Shown += (_, _) => {
+            foreach ((string? versionName, var stream) in changelogs) {
+                WhatsNewDialog.Show($"Whats new in Studio v{versionName}?", new StreamReader(stream).ReadToEnd());
+                stream.Dispose();
+            }
+        };
     }
 
     public static void ApplyPostLoadMigrations() {
@@ -68,12 +75,4 @@ public static void ApplyPostLoadMigrations() {
             }
         }
     }
-
-    public static async Task ShowChangelogs() {
-        foreach ((string? versionName, var stream) in changelogs) {
-            WhatsNewDialog.Show($"Whats new in Studio v{versionName}?", await new StreamReader(stream).ReadToEndAsync().ConfigureAwait(false));
-            await stream.DisposeAsync().ConfigureAwait(false);
-        }
-        changelogs.Clear();
-    }
 }
diff --git a/Studio/CelesteStudio/Studio.cs b/Studio/CelesteStudio/Studio.cs
@@ -164,12 +164,6 @@ public Studio(string[] args, Action<Window> windowCreationCallback) {
                 OnNewFile();
             }
         };
-        Shown += (_, _) => Task.Run(async () => {
-            // Wait a bit, so that the window definitely is shown
-            // A bit janky, but not doing this seems to cause issues
-            await Task.Delay(5_000).ConfigureAwait(false);
-            await Application.Instance.InvokeAsync(Migrator.ShowChangelogs).ConfigureAwait(false);
-        });
 
         CommunicationWrapper.Start();
     }