From 9806366774da0f9818bfd46a21677cc8ec52dbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Tue, 21 Jul 2026 10:45:54 -0700
Subject: [PATCH] Application: move startup tasks to startup

---
 src/Application.vala | 15 +++++++++++++++
 src/MainWindow.vala  | 11 -----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Application.vala b/src/Application.vala
index 56581cb32..a1b293bc3 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -152,6 +152,21 @@ namespace Scratch {
             return Posix.EXIT_SUCCESS;
         }
 
+        protected override void startup () {
+            base.startup ();
+
+            Hdy.init ();
+
+            var provider = new Gtk.CssProvider ();
+            provider.load_from_resource ("io/elementary/code/Application.css");
+            Gtk.StyleContext.add_provider_for_screen (
+                Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
+            );
+
+            weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
+            default_theme.add_resource_path ("/io/elementary/code");
+        }
+
         protected override void activate () {
             if (active_window == null) {
                 if (location_jump_manager.has_selection_range () && location_jump_manager.has_override_target ()) {
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 2e948dc0e..89a5ffa02 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -244,19 +244,11 @@ namespace Scratch {
             action_accelerators.set (ACTION_MOVE_TAB_TO_NEW_WINDOW, "<Control><Alt>n");
             action_accelerators.set (ACTION_RESTORE_PROJECT_DOCS + "::", "<Control><Shift>r");
 
-            var provider = new Gtk.CssProvider ();
-            provider.load_from_resource ("io/elementary/code/Application.css");
-            Gtk.StyleContext.add_provider_for_screen (
-                Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-            );
-
             if (Constants.BRANCH != "") {
                 base_title = _("Code (%s)").printf (Constants.BRANCH);
             } else {
                 base_title = _("Code");
             }
-
-            Hdy.init ();
         }
 
         construct {
@@ -265,9 +257,6 @@ namespace Scratch {
             is_first_window = application.get_windows ().length () == 1;
             title = base_title;
 
-            weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
-            default_theme.add_resource_path ("/io/elementary/code");
-
             document_manager = Scratch.Services.DocumentManager.get_instance ();
             git_manager = Services.GitManager.get_instance ();