Skip to content

Commit 3b8217d

Browse files
authored
Merge branch 'main' into leolost/fix-moving-stacking-order
2 parents ad3bcf6 + 0991de2 commit 3b8217d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/ScreenshotManager.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ namespace Gala {
155155
var rect = window.get_frame_rect ();
156156
#if HAS_MUTTER45
157157
if (!include_frame) {
158-
#if else
158+
#else
159159
if ((include_frame && window.is_client_decorated ()) ||
160160
(!include_frame && !window.is_client_decorated ())) {
161161
#endif

src/Widgets/WindowClone.vala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,10 @@ public class Gala.WindowClone : Clutter.Actor {
266266
update_hover_widgets (false);
267267
toggle_shadow (false);
268268
});
269+
270+
if (should_fade ()) {
271+
new GesturePropertyTransition (this, gesture_tracker, "opacity", null, 0u).start (with_gesture);
272+
}
269273
}
270274

271275
/**
@@ -294,6 +298,7 @@ public class Gala.WindowClone : Clutter.Actor {
294298
new GesturePropertyTransition (this, gesture_tracker, "y", intial_y, (float) rect.y).start (with_gesture);
295299
new GesturePropertyTransition (this, gesture_tracker, "width", (float) initial_width, (float) rect.width).start (with_gesture);
296300
new GesturePropertyTransition (this, gesture_tracker, "height", (float) initial_height, (float) rect.height).start (with_gesture);
301+
new GesturePropertyTransition (this, gesture_tracker, "opacity", null, 255u).start (with_gesture);
297302
new GesturePropertyTransition (this, gesture_tracker, "shadow-opacity", (uint8) 0, (uint8) 255).start (with_gesture);
298303
new GesturePropertyTransition (window_icon, gesture_tracker, "opacity", 0u, 255u).start (with_gesture, () => {
299304
update_hover_widgets (false);

0 commit comments

Comments
 (0)