Skip to content

Application: use built-in GLib functions in Activate #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 4 commits into from
Jan 23, 2023
Merged

Application: use built-in GLib functions in Activate #1243

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b847d3
Application: use built-in GLib functions in Activate
danirabbit Jan 14, 2023
755e7d6
Merge branch 'master' into application-activateglib
danirabbit Jan 14, 2023
038e03f
Merge branch 'master' into application-activateglib
danirabbit Jan 15, 2023
b15b86d
Merge branch 'master' into application-activateglib
Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down