Skip to content

Commit 2b7653d

Browse files
committed
Rename to GesturePropertyTransition, add done signal
1 parent d36034f commit 2b7653d

File tree

4 files changed

+30
-24
lines changed

4 files changed

+30
-24
lines changed

src/Gestures/PropertyGestureTransition.vala

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
public class Gala.PropertyGestureTransition : Object {
1+
2+
3+
public class Gala.GesturePropertyTransition : Object {
4+
public signal void done ();
5+
26
public Clutter.Actor actor { get; construct; }
37
public GestureTracker gesture_tracker { get; construct; }
48
public string property { get; construct; }
@@ -7,7 +11,7 @@ public class Gala.PropertyGestureTransition : Object {
711
public bool with_gesture { get; construct; }
812
public Value? intermediate_value { get; construct; }
913

10-
public PropertyGestureTransition (
14+
public GesturePropertyTransition (
1115
Clutter.Actor actor,
1216
GestureTracker gesture_tracker,
1317
string property,
@@ -56,6 +60,8 @@ public class Gala.PropertyGestureTransition : Object {
5660
actor.set_property (property, cancel_action ? from_value : to_value);
5761
actor.restore_easing_state ();
5862

63+
done ();
64+
5965
unref ();
6066
};
6167

src/Widgets/MultitaskingView.vala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ namespace Gala {
384384
}
385385

386386
if (is_nudge_animation) {
387-
new PropertyGestureTransition (workspaces, workspace_gesture_tracker, "x", null, initial_x, true, initial_x + nudge_gap * -relative_dir);
387+
new GesturePropertyTransition (workspaces, workspace_gesture_tracker, "x", null, initial_x, true, initial_x + nudge_gap * -relative_dir);
388388
} else {
389-
new PropertyGestureTransition (workspaces, workspace_gesture_tracker, "x", null, target_x, true);
390-
new PropertyGestureTransition (active_icon_group, workspace_gesture_tracker, "backdrop-opacity", 1f, 0f, true);
391-
new PropertyGestureTransition (target_icon_group, workspace_gesture_tracker, "backdrop-opacity", 0f, 1f, true);
389+
new GesturePropertyTransition (workspaces, workspace_gesture_tracker, "x", null, target_x, true);
390+
new GesturePropertyTransition (active_icon_group, workspace_gesture_tracker, "backdrop-opacity", 1f, 0f, true);
391+
new GesturePropertyTransition (target_icon_group, workspace_gesture_tracker, "backdrop-opacity", 0f, 1f, true);
392392
}
393393

394394
GestureTracker.OnEnd on_animation_end = (percentage, cancel_action, calculated_duration) => {

src/Widgets/WindowClone.vala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@ public class Gala.WindowClone : Clutter.Actor {
288288
in_slot_animation = true;
289289
place_widgets (outer_rect.width, outer_rect.height, initial_scale);
290290

291-
new PropertyGestureTransition (this, gesture_tracker, "x", null, (float) target_x, with_gesture);
292-
new PropertyGestureTransition (this, gesture_tracker, "y", null, (float) target_y, with_gesture);
293-
new PropertyGestureTransition (this, gesture_tracker, "width", null, (float) outer_rect.width, with_gesture);
294-
new PropertyGestureTransition (this, gesture_tracker, "height", null, (float) outer_rect.height, with_gesture);
295-
new PropertyGestureTransition (this, gesture_tracker, "shadow-opacity", 255f, 0f, with_gesture);
296-
new PropertyGestureTransition (window_icon, gesture_tracker, "opacity", 255f, 0f, with_gesture);
291+
new GesturePropertyTransition (this, gesture_tracker, "x", null, (float) target_x, with_gesture);
292+
new GesturePropertyTransition (this, gesture_tracker, "y", null, (float) target_y, with_gesture);
293+
new GesturePropertyTransition (this, gesture_tracker, "width", null, (float) outer_rect.width, with_gesture);
294+
new GesturePropertyTransition (this, gesture_tracker, "height", null, (float) outer_rect.height, with_gesture);
295+
new GesturePropertyTransition (this, gesture_tracker, "shadow-opacity", 255f, 0f, with_gesture);
296+
new GesturePropertyTransition (window_icon, gesture_tracker, "opacity", 255f, 0f, with_gesture);
297297

298298
GestureTracker.OnUpdate on_animation_update = (percentage) => {
299299
var width = GestureTracker.animation_value (initial_width, outer_rect.width, percentage);
@@ -359,12 +359,12 @@ public class Gala.WindowClone : Clutter.Actor {
359359
in_slot_animation = true;
360360
place_widgets (rect.width, rect.height, scale);
361361

362-
new PropertyGestureTransition (this, gesture_tracker, "x", null, (float) rect.x, with_gesture);
363-
new PropertyGestureTransition (this, gesture_tracker, "y", null, (float) rect.y, with_gesture);
364-
new PropertyGestureTransition (this, gesture_tracker, "width", null, (float) rect.width, with_gesture);
365-
new PropertyGestureTransition (this, gesture_tracker, "height", null, (float) rect.height, with_gesture);
366-
new PropertyGestureTransition (this, gesture_tracker, "shadow-opacity", 0f, 255f, with_gesture);
367-
new PropertyGestureTransition (window_icon, gesture_tracker, "opacity", 0f, 255f, with_gesture);
362+
new GesturePropertyTransition (this, gesture_tracker, "x", null, (float) rect.x, with_gesture);
363+
new GesturePropertyTransition (this, gesture_tracker, "y", null, (float) rect.y, with_gesture);
364+
new GesturePropertyTransition (this, gesture_tracker, "width", null, (float) rect.width, with_gesture);
365+
new GesturePropertyTransition (this, gesture_tracker, "height", null, (float) rect.height, with_gesture);
366+
new GesturePropertyTransition (this, gesture_tracker, "shadow-opacity", 0f, 255f, with_gesture);
367+
new GesturePropertyTransition (window_icon, gesture_tracker, "opacity", 0f, 255f, with_gesture);
368368

369369
GestureTracker.OnUpdate on_animation_update = (percentage) => {
370370
var width = GestureTracker.animation_value (initial_width, rect.width, percentage);

src/Widgets/WorkspaceClone.vala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,9 @@ namespace Gala {
369369

370370
update_size (monitor);
371371

372-
new PropertyGestureTransition (this, gesture_tracker, "x", initial_x, target_x, with_gesture);
373-
new PropertyGestureTransition (background, gesture_tracker, "scale-x", 1.0f, (float) scale, with_gesture);
374-
new PropertyGestureTransition (background, gesture_tracker, "scale-y", 1.0f, (float) scale, with_gesture);
372+
new GesturePropertyTransition (this, gesture_tracker, "x", initial_x, target_x, with_gesture);
373+
new GesturePropertyTransition (background, gesture_tracker, "scale-x", 1.0f, (float) scale, with_gesture);
374+
new GesturePropertyTransition (background, gesture_tracker, "scale-y", 1.0f, (float) scale, with_gesture);
375375

376376
#if HAS_MUTTER45
377377
Mtk.Rectangle area = {
@@ -415,9 +415,9 @@ namespace Gala {
415415
double initial_scale_x, initial_scale_y;
416416
background.get_scale (out initial_scale_x, out initial_scale_y);
417417

418-
new PropertyGestureTransition (this, gesture_tracker, "x", initial_x, target_x, with_gesture);
419-
new PropertyGestureTransition (background, gesture_tracker, "scale-x", initial_scale_x, 1.0f, with_gesture);
420-
new PropertyGestureTransition (background, gesture_tracker, "scale-y", initial_scale_y, 1.0f, with_gesture);
418+
new GesturePropertyTransition (this, gesture_tracker, "x", initial_x, target_x, with_gesture);
419+
new GesturePropertyTransition (background, gesture_tracker, "scale-x", initial_scale_x, 1.0f, with_gesture);
420+
new GesturePropertyTransition (background, gesture_tracker, "scale-y", initial_scale_y, 1.0f, with_gesture);
421421

422422
window_container.close (with_gesture, is_cancel_animation);
423423
}

0 commit comments

Comments
 (0)