From cd9f43af7d95030e29483c1dbb3ceb80e2bbf20a Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Thu, 29 Oct 2015 16:32:58 +0000
Subject: [PATCH] don't activate clients (autohide) if we're dragging a window

BUG: 352267
REVIEW: 125867
---
 screenedge.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/screenedge.cpp b/screenedge.cpp
index 1bbead6bf1..db9a648817 100644
--- a/screenedge.cpp
+++ b/screenedge.cpp
@@ -186,12 +186,6 @@ bool Edge::canActivate(const QPoint &cursorPos, const QDateTime &triggerTime)
 
 void Edge::handle(const QPoint &cursorPos)
 {
-    if (m_client) {
-        pushCursorBack(cursorPos);
-        m_client->showOnScreenEdge();
-        unreserve();
-        return;
-    }
     AbstractClient *movingClient = Workspace::self()->getMovingClient();
     bool isResize = false;
     if (Client *movingClientClient = qobject_cast<Client*>(movingClient))
@@ -210,6 +204,14 @@ void Edge::handle(const QPoint &cursorPos)
         // work as we hold a grab.
         return;
     }
+
+    if (m_client) {
+        pushCursorBack(cursorPos);
+        m_client->showOnScreenEdge();
+        unreserve();
+        return;
+    }
+
     if (handleAction() || handleByCallback()) {
         pushCursorBack(cursorPos);
         return;