Merge branch 'main' into danirabbit/metainfo-modernize

elementary-community · Sep 23, 2024 · f84b587 · f84b587
2 parents 21b6596 + 9a9bf46
commit f84b587
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/src/Application.vala b/src/Application.vala
@@ -22,27 +22,37 @@ public class Taxi.Taxi : Gtk.Application {
         );
     }
 
-    protected override void activate () {
-        var main_window = new MainWindow (
-            this,
-            new LocalFileAccess (),
-            new RemoteFileAccess (),
-            new FileOperations (),
-            new ConnectionSaver ()
-        );
+    protected override void startup () {
+        base.startup ();
+
+        Hdy.init ();
+
+        var provider = new Gtk.CssProvider ();
+        provider.load_from_resource ("com/github/alecaddd/taxi/Application.css");
+        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
 
         gtk_settings.gtk_application_prefer_dark_theme = (
-            granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK
+            granite_settings.prefers_color_scheme == DARK
         );
 
         granite_settings.notify["prefers-color-scheme"].connect (() => {
             gtk_settings.gtk_application_prefer_dark_theme = (
-                granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK
+                granite_settings.prefers_color_scheme == DARK
             );
         });
+    }
+
+    protected override void activate () {
+        var main_window = new MainWindow (
+            this,
+            new LocalFileAccess (),
+            new RemoteFileAccess (),
+            new FileOperations (),
+            new ConnectionSaver ()
+        );
 
         main_window.show_all ();
     }

diff --git a/src/Frontend/MainWindow.vala b/src/Frontend/MainWindow.vala
@@ -50,8 +50,6 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {
     }
 
     construct {
-        Hdy.init ();
-
         connect_box = new ConnectBox ();
         connect_box.valign = Gtk.Align.CENTER;
 
@@ -154,10 +152,6 @@ class Taxi.MainWindow : Hdy.ApplicationWindow {
             maximize ();
         }
 
-        var provider = new Gtk.CssProvider ();
-        provider.load_from_resource ("com/github/alecaddd/taxi/Application.css");
-        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
         connect_box.connect_initiated.connect (on_connect_initiated);
         connect_box.ask_hostname.connect (on_ask_hostname);
         connect_box.bookmarked.connect (bookmark);