Skip to content

Commit effff3d

Browse files
authored
Merge branch 'main' into lenemter/cleanup-delegate-actor
2 parents fbe848f + bb04c32 commit effff3d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/ShellClients/HideTracker.vala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public class Gala.HideTracker : Object {
5151
if (hide_timeout_id != 0) {
5252
Source.remove (hide_timeout_id);
5353
}
54+
55+
if (update_timeout_id != 0) {
56+
Source.remove (update_timeout_id);
57+
}
5458
}
5559

5660
construct {
@@ -95,7 +99,7 @@ public class Gala.HideTracker : Object {
9599
display.get_stage ().add_action_full ("panel-swipe-gesture", CAPTURE, pan_action);
96100
}
97101

98-
//Can be removed with mutter > 45
102+
#if !HAS_MUTTER45
99103
private bool window_has_pointer () {
100104
var cursor_tracker = display.get_cursor_tracker ();
101105
Graphene.Point pointer_pos;
@@ -114,6 +118,7 @@ public class Gala.HideTracker : Object {
114118
};
115119
return graphene_window_rect.contains_point (pointer_pos);
116120
}
121+
#endif
117122

118123
private void track_focus_window (Meta.Window? window) {
119124
if (window == null) {

src/WindowManager.vala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,6 +1300,8 @@ namespace Gala {
13001300
case Meta.SizeChange.UNFULLSCREEN:
13011301
handle_fullscreen_window (window, which_change_local);
13021302
break;
1303+
default:
1304+
break;
13031305
}
13041306

13051307
size_change_completed (actor);

0 commit comments

Comments
 (0)