From e1bb6149995caaf081d2c7bd12f058cb38f38767 Mon Sep 17 00:00:00 2001
From: Rob Scheepmaker <r.scheepmaker@student.utwente.nl>
Date: Sun, 30 Nov 2008 11:45:23 +0000
Subject: [PATCH] Fixed crash when clicking an extenders dragger without
 actually dragging, and fixed the 'hand problem'.

svn path=/trunk/KDE/kdelibs/; revision=890806
---
 extenderitem.cpp         | 23 ++++++++++++++---------
 private/extenderitem_p.h |  1 +
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/extenderitem.cpp b/extenderitem.cpp
index 95ed5e50f..ac616c744 100644
--- a/extenderitem.cpp
+++ b/extenderitem.cpp
@@ -532,14 +532,16 @@ void ExtenderItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
     d->mousePos = event->pos().toPoint();
     d->deltaScene = pos();
+    d->mousePressed = true;
 }
 
 void ExtenderItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
-    if ((d->mousePos - event->pos().toPoint()).manhattanLength()
-                       >= QApplication::startDragDistance()) {
-        d->mousePressed = true;
+    if (!d->dragStarted && (d->mousePos - event->pos().toPoint()).manhattanLength()
+                           >= QApplication::startDragDistance()) {
         //start the drag:
+        d->dragStarted = true;
+
         //set the zValue to the maximum.
         d->hostApplet()->raise();
         setZValue(d->hostApplet()->zValue());
@@ -551,9 +553,7 @@ void ExtenderItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
         d->extender->d->removeExtenderItem(this);
 
         d->themeChanged();
-    }
-
-    if (!d->mousePressed) {
+    } else if (!d->dragStarted) {
         return;
     }
 
@@ -700,7 +700,13 @@ void ExtenderItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 void ExtenderItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     if (d->mousePressed) {
-        d->mousePressed = false;
+        QApplication::restoreOverrideCursor();
+    }
+
+    d->mousePressed = false;
+
+    if (d->dragStarted) {
+        d->dragStarted = false;
 
         //remove the toplevel view
         if (d->toplevel) {
@@ -775,8 +781,6 @@ void ExtenderItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
                 setExtender(extender());
             }
         }
-
-        QApplication::restoreOverrideCursor();
     }
 }
 
@@ -794,6 +798,7 @@ ExtenderItemPrivate::ExtenderItemPrivate(ExtenderItem *extenderItem, Extender *h
       title(QString()),
       mousePressed(false),
       mouseOver(false),
+      dragStarted(false),
       destroyActionVisibility(false),
       expirationTimer(0)
 {
diff --git a/private/extenderitem_p.h b/private/extenderitem_p.h
index f1462cca3..24368cd18 100644
--- a/private/extenderitem_p.h
+++ b/private/extenderitem_p.h
@@ -91,6 +91,7 @@ class ExtenderItemPrivate
 
         bool mousePressed;
         bool mouseOver;
+        bool dragStarted;
         bool destroyActionVisibility;
 
         QTimer *expirationTimer;