workspace: End zooming when starting a window drag

The mouse-wheel zooming "easter egg" breaks horribly when you
drag a window, due to ugly lightbox reparenting tricks it uses.

For now, just end any zoom before we drag the window around.

https://bugzilla.gnome.org/show_bug.cgi?id=649632
This commit is contained in:
Jasper St. Pierre 2011-05-11 17:43:25 -04:00 committed by Owen W. Taylor
parent ca6308ae64
commit 70ab08aefd

View File

@ -296,6 +296,9 @@ WindowClone.prototype = {
}, },
_onDragBegin : function (draggable, time) { _onDragBegin : function (draggable, time) {
if (this._zooming)
this._zoomEnd();
[this.dragOrigX, this.dragOrigY] = this.actor.get_position(); [this.dragOrigX, this.dragOrigY] = this.actor.get_position();
this.dragOrigScale = this.actor.scale_x; this.dragOrigScale = this.actor.scale_x;
this.inDrag = true; this.inDrag = true;