From 1b847d356a98f07a520c3537e5cee34f9883a4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Sat, 14 Jan 2023 12:48:35 -0800 Subject: [PATCH] Application: use built-in GLib functions in Activate --- src/Application.vala | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Application.vala b/src/Application.vala index 61a876042f..4fb5003efb 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -127,21 +127,19 @@ namespace Scratch { } protected override void activate () { - var window = get_last_window (); - if (window != null && create_new_window) { + if (active_window == null) { + add_window (new MainWindow (true)); // Will restore documents if required + } else if (create_new_window) { create_new_window = false; - window = new MainWindow (false); // Will NOT restore documents in additional windows - } else if (window == null) { - window = new MainWindow (true); // Will restore documents if required - window.show (); - } else { - window.present (); + add_window (new MainWindow (false)); // Will NOT restore documents in additional windows } + active_window.present (); + // Create a new document if requested if (create_new_tab) { create_new_tab = false; - Utils.action_from_group (MainWindow.ACTION_NEW_TAB, window.actions).activate (null); + activate_action (MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW_TAB, null); } }