Skip to content

Commit dc6bc70

Browse files
authored
Merge branch 'main' into lenemter/fix-dock-for-real-this-time
2 parents 3a01a31 + 5adb554 commit dc6bc70

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/ShellClients/PanelClone.vala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,21 @@ public class Gala.PanelClone : Object {
154154
panel.window.move_frame (false, panel.delegate_actor.actual_x, panel.delegate_actor.actual_y);
155155
}
156156

157-
var animation_duration = get_animation_duration ();
158-
159157
clone.save_easing_state ();
160158
clone.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
161-
clone.set_easing_duration (animation_duration);
159+
clone.set_easing_duration (get_animation_duration ());
162160
clone.y = calculate_clone_y (false);
163161
clone.restore_easing_state ();
164162

165-
Timeout.add (animation_duration, () => {
163+
unowned var y_transition = clone.get_transition ("y");
164+
if (y_transition != null) {
165+
y_transition.completed.connect (() => {
166+
clone.visible = false;
167+
panel_hidden = false;
168+
});
169+
} else {
166170
clone.visible = false;
167171
panel_hidden = false;
168-
return Source.REMOVE;
169-
});
172+
}
170173
}
171174
}

0 commit comments

Comments
 (0)