[gnome-shell] dnd: Fix regression from e6fd2be
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] dnd: Fix regression from e6fd2be
- Date: Wed, 3 Oct 2012 00:16:49 +0000 (UTC)
commit d4ce7aef595b5261c8bd7a03d7eeea8ab3c308e3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Oct 2 21:11:49 2012 -0300
dnd: Fix regression from e6fd2be
We need to fetch the actor's parent before we reparent, otherwise
we won't put it back properly at the end.
js/ui/dnd.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index b99eb45..25769d2 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -267,9 +267,6 @@ const _Draggable = new Lang.Class({
this._dragOffsetY = this._dragActor.y - this._dragStartY;
} else {
this._dragActor = this.actor;
- this._dragActor.reparent(Main.uiGroup);
- this._dragActor.raise_top();
- Shell.util_set_hidden_from_pick(this._dragActor, true);
this._dragActorSource = undefined;
this._dragOrigParent = this.actor.get_parent();
@@ -277,6 +274,10 @@ const _Draggable = new Lang.Class({
this._dragOrigY = this._dragActor.y;
this._dragOrigScale = this._dragActor.scale_x;
+ this._dragActor.reparent(Main.uiGroup);
+ this._dragActor.raise_top();
+ Shell.util_set_hidden_from_pick(this._dragActor, true);
+
let [actorStageX, actorStageY] = this.actor.get_transformed_position();
this._dragOffsetX = actorStageX - this._dragStartX;
this._dragOffsetY = actorStageY - this._dragStartY;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]