elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-26 18:53:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve debug messages in notifications stack and add more checks (#1805)

Browse Source
This commit is contained in:
Leo 2023-12-14 04:29:12 +09:00 committed by GitHub
parent 51d270e778
commit 186e9a304a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/NotificationStack.vala
View File

@ -48,10 +48,17 @@ public class Gala.NotificationStack : Object {
update_stack_allocation (); update_stack_allocation ();
} }
public void show_notification (Meta.WindowActor notification, bool animate) requires (!notifications.contains (notification)) { public void show_notification (Meta.WindowActor notification, bool animate)
requires (notification != null && !notification.is_destroyed () && !notifications.contains (notification)) {
notification.set_pivot_point (0.5f, 0.5f); notification.set_pivot_point (0.5f, 0.5f);
unowned Meta.Window window = notification.get_meta_window (); unowned var window = notification.get_meta_window ();
if (window == null) {
warning ("NotificationStack: Unable to show notification, window is null");
return;
}
var window_rect = window.get_frame_rect (); var window_rect = window.get_frame_rect ();
window.stick (); window.stick ();
@ -110,7 +117,13 @@ public class Gala.NotificationStack : Object {
var iterator = 0; var iterator = 0;
// Need to iterate like this since we might be removing entries // Need to iterate like this since we might be removing entries
while (notifications.size > iterator) { while (notifications.size > iterator) {
var actor = notifications.get (iterator); unowned var actor = notifications.get (iterator);
iterator++;
if (actor == null || actor.is_destroyed ()) {
warning ("NotificationStack: Notification actor was null or destroyed");
continue;
}
if (animate) { if (animate) {
actor.save_easing_state (); actor.save_easing_state ();
actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK); actor.set_easing_mode (Clutter.AnimationMode.EASE_OUT_BACK);
@ -124,11 +137,7 @@ public class Gala.NotificationStack : Object {
actor.restore_easing_state (); actor.restore_easing_state ();
} }
// For some reason get_transition doesn't work later when we need to restore it unowned var window = actor.get_meta_window ();
unowned Clutter.Transition? transition = actor.get_transition ("position");
actor.set_data<Clutter.Transition?> (TRANSITION_MOVE_STACK_ID, transition);
unowned Meta.Window window = actor.get_meta_window ();
if (window == null) { if (window == null) {
// Mutter doesn't let us know when a window is closed if a workspace // Mutter doesn't let us know when a window is closed if a workspace
// transition is in progress. I'm not really sure why, but what this // transition is in progress. I'm not really sure why, but what this
@ -141,7 +150,6 @@ public class Gala.NotificationStack : Object {
} }
y += window.get_frame_rect ().height; y += window.get_frame_rect ().height;
iterator++;
} }
} }
@ -174,13 +182,10 @@ public class Gala.NotificationStack : Object {
* in the compositor and then calculate & apply the coordinates for the window * in the compositor and then calculate & apply the coordinates for the window
* actor. * actor.
*/ */
private static void move_window (Meta.WindowActor actor, int x, int y) { private static void move_window (Meta.WindowActor actor, int x, int y) requires (actor != null && !actor.is_destroyed ()) {
if (actor.is_destroyed ()) { unowned var window = actor.get_meta_window ();
return;
}
unowned Meta.Window window = actor.get_meta_window ();
if (window == null) { if (window == null) {
warning ("NotificationStack: Unable to move the window, window is null");
return; return;
} }