Skip to content

Commit 10fd0b4

Browse files
authored
Merge branch 'main' into lenemter/release-8.2.1
2 parents 034b9a9 + 789a3b0 commit 10fd0b4

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ po/Rules-quot
4747
po/stamp-po
4848
src/gala
4949
build
50+
debian

data/gala.metainfo.xml.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@
2727
<update_contact>contact_at_elementary.io</update_contact>
2828

2929
<releases>
30+
<release version="8.2.1" date="2025-05-15" urgency="medium">
31+
<description>
32+
<p>Improvements:</p>
33+
<ul>
34+
<li>Updated translations</li>
35+
</ul>
36+
</description>
37+
<issues>
38+
<issue url="https://github.com/elementary/gala/issues/2322">Workspace Switch</issue>
39+
</issues>
40+
</release>
41+
3042
<release version="8.2.0" date="2025-05-13" urgency="medium">
3143
<description>
3244
<p>Improvements:</p>

lib/Utils.vala

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,6 @@ namespace Gala {
404404
return texture;
405405
}
406406

407-
private static HashTable<Meta.Window, X.XserverRegion?> regions = new HashTable<Meta.Window, X.XserverRegion?> (null, null);
408-
409407
public static void x11_set_window_pass_through (Meta.Window window) {
410408
unowned var x11_display = window.display.get_x11_display ();
411409

@@ -416,10 +414,7 @@ namespace Gala {
416414
#endif
417415
unowned var xdisplay = x11_display.get_xdisplay ();
418416

419-
regions[window] = X.Fixes.create_region_from_window (xdisplay, x_window, 0);
420-
421417
X.Xrectangle rect = {};
422-
423418
var region = X.Fixes.create_region (xdisplay, {rect});
424419

425420
X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);
@@ -437,16 +432,7 @@ namespace Gala {
437432
#endif
438433
unowned var xdisplay = x11_display.get_xdisplay ();
439434

440-
var region = regions[window];
441-
442-
if (region == null) {
443-
return;
444-
}
445-
446-
X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);
447-
448-
regions.remove (window);
449-
X.Fixes.destroy_region (xdisplay, region);
435+
X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, (X.XserverRegion) 0);
450436
}
451437

452438
/**

src/Widgets/MultitaskingView/MultitaskingView.vala

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,10 @@ public class Gala.MultitaskingView : ActorTarget, RootTarget, ActivatableCompone
9999
manager.workspaces_reordered.connect (on_workspaces_reordered);
100100
manager.workspace_switched.connect (on_workspace_switched);
101101

102-
manager.bind_property (
103-
"n-workspaces",
104-
workspaces_gesture_controller,
105-
"overshoot-lower-clamp",
106-
DEFAULT,
107-
(binding, from_value, ref to_value) => {
108-
to_value.set_double (-from_value.get_int () - 0.1 + 1);
109-
}
110-
);
102+
workspaces_gesture_controller.overshoot_lower_clamp = -manager.n_workspaces - 0.1 + 1;
103+
manager.notify["n-workspaces"].connect (() => {
104+
workspaces_gesture_controller.overshoot_lower_clamp = -manager.n_workspaces - 0.1 + 1;
105+
});
111106

112107
window_containers_monitors = new List<MonitorClone> ();
113108
update_monitors ();

0 commit comments

Comments
 (0)