From 70ab08aefd1d4a335a5256480dbc5f677183a1f1 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 11 May 2011 17:43:25 -0400
Subject: [PATCH] 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
---
 js/ui/workspace.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 2d487660e..92f2cf573 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -296,6 +296,9 @@ WindowClone.prototype = {
     },
 
     _onDragBegin : function (draggable, time) {
+        if (this._zooming)
+            this._zoomEnd();
+
         [this.dragOrigX, this.dragOrigY] = this.actor.get_position();
         this.dragOrigScale = this.actor.scale_x;
         this.inDrag = true;