← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnome-shell/quantal

« back to all changes in this revision

Viewing changes to js/ui/dnd.js

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Jeremy Bicha, Tim Lunn
  • Date: 2012-10-16 12:16:51 UTC
  • mfrom: (1.1.45)
  • Revision ID: package-import@ubuntu.com-20121016121651-dddhhlhs2fbfjaec
Tags: 3.6.1-0ubuntu1
https://launchpad.net/bugs/1067145
https://launchpad.net/bugs/1058845
https://launchpad.net/bugs/1063110
[ Jeremy Bicha ]
* New upstream bugfix release (LP: #1067145).
* debian/control.in:
  - Bump minimum mutter to 3.6.1
* debian/patches/ubuntu-lightdm-user-switching.patch:
  - Dropped, included in new release

[ Tim Lunn ]
* debian/source_gnome-shell.py
  - Update apport hook to log running display manager (LP: #1058845)
  - Update apport hook to collect gnome-shell session logs
* debian/patches/ubuntu_lock_on_suspend.patch:
  - fix lock on suspend via user menu (LP: #1063110)

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/ui/dnd.js
235
235
 
236
236
        if (this.actor._delegate && this.actor._delegate.getDragActor) {
237
237
            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
 
238
            this._dragActor.reparent(Main.uiGroup);
 
239
            this._dragActor.raise_top();
 
240
            Shell.util_set_hidden_from_pick(this._dragActor, true);
 
241
 
238
242
            // Drag actor does not always have to be the same as actor. For example drag actor
239
243
            // can be an image that's part of the actor. So to perform "snap back" correctly we need
240
244
            // to know what was the drag actor source.
263
267
            this._dragOffsetY = this._dragActor.y - this._dragStartY;
264
268
        } else {
265
269
            this._dragActor = this.actor;
 
270
 
266
271
            this._dragActorSource = undefined;
267
272
            this._dragOrigParent = this.actor.get_parent();
268
273
            this._dragOrigX = this._dragActor.x;
269
274
            this._dragOrigY = this._dragActor.y;
270
275
            this._dragOrigScale = this._dragActor.scale_x;
271
276
 
 
277
            this._dragActor.reparent(Main.uiGroup);
 
278
            this._dragActor.raise_top();
 
279
            Shell.util_set_hidden_from_pick(this._dragActor, true);
 
280
 
272
281
            let [actorStageX, actorStageY] = this.actor.get_transformed_position();
273
282
            this._dragOffsetX = actorStageX - this._dragStartX;
274
283
            this._dragOffsetY = actorStageY - this._dragStartY;
280
289
                                 scaledHeight / this.actor.height);
281
290
        }
282
291
 
283
 
        this._dragActor.reparent(Main.uiGroup);
284
 
        this._dragActor.raise_top();
285
 
        Shell.util_set_hidden_from_pick(this._dragActor, true);
286
 
 
287
292
        this._dragOrigOpacity = this._dragActor.opacity;
288
293
        if (this._dragActorOpacity != undefined)
289
294
            this._dragActor.opacity = this._dragActorOpacity;