Skip to content

Application: Gtk4 preparation #887

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
jeremypw merged 8 commits into from
Aug 8, 2025
Merged

Application: Gtk4 preparation #887

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7276390
Update header
jeremypw Aug 1, 2025
b9c0ff9
Use present after notification fix from Gtk4 port
jeremypw Aug 1, 2025
725d586
Avoid Gtk.Window.get_state ()
jeremypw Aug 1, 2025
32135f9
Avoid focus_in_event
jeremypw Aug 1, 2025
d4cdc07
Correct date format
jeremypw Aug 3, 2025
ab7971d
Merge branch 'master' into jeremypw/application/gtk4prep
jeremypw Aug 3, 2025
144db08
Remove idle
jeremypw Aug 3, 2025
53a45f8
Merge branch 'master' into jeremypw/application/gtk4prep
jeremypw Aug 8, 2025
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
26 changes: 7 additions & 19 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2011-2023 elementary, Inc. (https://elementary.io)
* SPDX-License-Identifier: LGPL-3.0-only
* SPDX-License-Identifier: LGPL-3.0-or-later
* SPDX-FileCopyrightText: 2011-2025 elementary, Inc. (https://elementary.io)
*/

public class Terminal.Application : Gtk.Application {
Expand Down Expand Up @@ -46,18 +46,7 @@ public class Terminal.Application : Gtk.Application {
}
}

// This is a hack to avoid using Gdk-Xii dependency. Using present_with_time ()
// with the current event time does not work either on X11 or Wayland perhaps
// because the triggering event did not occur on the Terminal window?
// Using set_keep_above () at least works on X11 but not on Wayland
//TODO It may well be possible to use present () on Gtk4 so this needs revisiting
window_to_present.set_keep_above (true);
window_to_present.present ();
window_to_present.grab_focus ();
Idle.add (() => {
window_to_present.set_keep_above (false);
return Source.REMOVE;
});
});

add_main_option ("version", 'v', 0, OptionArg.NONE, _("Show version"), null);
Expand Down Expand Up @@ -196,7 +185,7 @@ public class Terminal.Application : Gtk.Application {
terminal.tab.icon = process_icon;
}

if (!(Gdk.WindowState.FOCUSED in terminal.main_window.get_window ().get_state ())) {
if (!(get_active_window ().is_active)) {

@danirabbit danirabbit Aug 1, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know this was already available in GTK3, very cool!

var notification = new Notification (process_string);
notification.set_body (process);
notification.set_icon (process_icon);
Expand All @@ -210,12 +199,11 @@ public class Terminal.Application : Gtk.Application {
withdraw_notification_for_terminal (terminal, id, tab_change_handler, focus_in_handler);
});

focus_in_handler = terminal.main_window.focus_in_event.connect (() => {
withdraw_notification_for_terminal (terminal, id, tab_change_handler, focus_in_handler);

return Gdk.EVENT_PROPAGATE;
focus_in_handler = terminal.main_window.notify["is-active"].connect (() => {
if (terminal.main_window.is_active) {
withdraw_notification_for_terminal (terminal, id, tab_change_handler, focus_in_handler);
}
});

}
});

Expand Down