From d784092f11e08b4188a881421f2491d4aa30f254 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 13 Jul 2024 20:35:04 +0200 Subject: app: move late-init code to on_startup --- app/include/turns/app/application.hpp | 1 + app/src/application.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp index d01eff2..4a29254 100644 --- a/app/include/turns/app/application.hpp +++ b/app/include/turns/app/application.hpp @@ -21,6 +21,7 @@ namespace turns::app auto on_activate() -> void override; auto on_shutdown() -> void override; + auto on_startup() -> void override; AdwApplicationWindow * m_main_window; }; diff --git a/app/src/application.cpp b/app/src/application.cpp index 660782e..9ab281c 100644 --- a/app/src/application.cpp +++ b/app/src/application.cpp @@ -23,9 +23,6 @@ namespace turns::app auto main_window = Gtk::Builder::get_widget_derived(builder, "main_window"); m_main_window = ADW_APPLICATION_WINDOW(main_window->gobj()); - - add_action("quit", sigc::mem_fun(*this, &application::handle_action_quit)); - set_accel_for_action("app.quit", "q"); } auto application::handle_action_quit() -> void @@ -48,4 +45,12 @@ namespace turns::app delete Glib::wrap(GTK_WINDOW(m_main_window)); } + auto application::on_startup() -> void + { + Gtk::Application::on_startup(); + + add_action("quit", sigc::mem_fun(*this, &application::handle_action_quit)); + set_accel_for_action("app.quit", "q"); + } + } // namespace turns::app \ No newline at end of file -- cgit v1.2.3