[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/workspace/kwin/clients/oxygen
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-01-17 3:05:31
Message-ID: 1263697531.163494.2981.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1075952 by hpereiradacosta:

Backport r1075951
always store dragpoint in mousePressEvent, disregarding the button;
reset mouseButton_ in mouseMoveEvent only if action is actually taken.
CCBUG 221997


 M  +3 -3      oxygenclient.cpp  


--- branches/KDE/4.4/kdebase/workspace/kwin/clients/oxygen/oxygenclient.cpp #1075951:1075952
@@ -1434,13 +1434,13 @@
 
     QPoint point = event->pos();
     if( itemClicked( point ) < 0 ) return false;
+    dragPoint_ = point;
 
     mouseButton_ = event->button();
     bool accepted( false );
     if( buttonToWindowOperation( mouseButton_ ) == ClientGroupDragOp )
     {
 
-      dragPoint_ = point;
       accepted = true;
 
     } else if( buttonToWindowOperation( mouseButton_ ) == OperationsOp ) {
@@ -1555,12 +1555,12 @@
         );
       }
 
+      // reset button
+      mouseButton_ = Qt::NoButton;
       accepted = true;
 
     }
 
-    // reset button
-    mouseButton_ = Qt::NoButton;
     return accepted;
 
   }
[prev in list] [next in list] [prev in thread] [next in thread]