Merge branch 'main' into lenemter/cleanup-delegate-actor

elementary · Dec 3, 2024 · effff3d · effff3d
2 parents fbe848f + bb04c32
commit effff3d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/ShellClients/HideTracker.vala b/src/ShellClients/HideTracker.vala
@@ -51,6 +51,10 @@ public class Gala.HideTracker : Object {
         if (hide_timeout_id != 0) {
             Source.remove (hide_timeout_id);
         }
+
+        if (update_timeout_id != 0) {
+            Source.remove (update_timeout_id);
+        }
     }
 
     construct {
@@ -95,7 +99,7 @@ public class Gala.HideTracker : Object {
         display.get_stage ().add_action_full ("panel-swipe-gesture", CAPTURE, pan_action);
     }
 
-    //Can be removed with mutter > 45
+#if !HAS_MUTTER45
     private bool window_has_pointer () {
         var cursor_tracker = display.get_cursor_tracker ();
         Graphene.Point pointer_pos;
@@ -114,6 +118,7 @@ public class Gala.HideTracker : Object {
         };
         return graphene_window_rect.contains_point (pointer_pos);
     }
+#endif
 
     private void track_focus_window (Meta.Window? window) {
         if (window == null) {

diff --git a/src/WindowManager.vala b/src/WindowManager.vala
@@ -1300,6 +1300,8 @@ namespace Gala {
                 case Meta.SizeChange.UNFULLSCREEN:
                     handle_fullscreen_window (window, which_change_local);
                     break;
+                default:
+                    break;
             }
 
             size_change_completed (actor);