From 7747f1c31db21689b24903f14f61719bd6544cb2 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 11 Sep 2013 13:35:17 -0400 Subject: [PATCH] workspacesView: Don't use a drag monitor to get the clone Just use the new variable passed to the signal. --- js/ui/workspacesView.js | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js index 90dce1ad2..e27070093 100644 --- a/js/ui/workspacesView.js +++ b/js/ui/workspacesView.js @@ -294,36 +294,18 @@ const WorkspacesView = new Lang.Class({ } }, - _dragBegin: function() { + _dragBegin: function(overview, clone) { if (this._scrolling) return; this._inDrag = true; - this._firstDragMotion = true; - - this._dragMonitor = { - dragMotion: Lang.bind(this, this._onDragMotion) - }; - DND.addDragMonitor(this._dragMonitor); - }, - - _onDragMotion: function(dragEvent) { - if (Main.overview.animationInProgress) - return DND.DragMotionResult.CONTINUE; - - if (this._firstDragMotion) { - this._firstDragMotion = false; - for (let i = 0; i < this._workspaces.length; i++) - this._workspaces[i].setReservedSlot(dragEvent.dragActor._delegate); - for (let i = 0; i < this._extraWorkspaces.length; i++) - this._extraWorkspaces[i].setReservedSlot(dragEvent.dragActor._delegate); - } - - return DND.DragMotionResult.CONTINUE; + for (let i = 0; i < this._workspaces.length; i++) + this._workspaces[i].setReservedSlot(clone); + for (let i = 0; i < this._extraWorkspaces.length; i++) + this._extraWorkspaces[i].setReservedSlot(clone); }, _dragEnd: function() { - DND.removeDragMonitor(this._dragMonitor); this._inDrag = false; for (let i = 0; i < this._workspaces.length; i++)