From 0e62916ccd84a4e8bc08769f689df169fb74eaca Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Sun, 10 Jan 2010 03:47:25 +0000
Subject: [PATCH] Display client menu on mouse press in the oxygen decoration.
 BUG: 221997

svn path=/trunk/KDE/kdebase/workspace/; revision=1072370
---
 clients/oxygen/oxygenclient.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index 404c5d4f08..a981d907f9 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -1445,7 +1445,11 @@ namespace Oxygen
 
     } else if( buttonToWindowOperation( mouseButton_ ) == OperationsOp ) {
 
-      accepted = true;
+      QPoint point = event->pos();
+      int itemClicked( OxygenClient::itemClicked( point ) );
+      displayClientMenu( itemClicked, widget()->mapToGlobal( event->pos() ) );
+      mouseButton_ = Qt::NoButton;
+      accepted = true; // displayClientMenu can possibly destroy the deco...
 
     }
     return accepted;
@@ -1471,14 +1475,6 @@ namespace Oxygen
         accepted = true;
       }
 
-    } else if( mouseButton_ == event->button() &&
-        buttonToWindowOperation( mouseButton_ ) == OperationsOp ) {
-
-      QPoint point = event->pos();
-      int itemClicked( OxygenClient::itemClicked( point ) );
-      displayClientMenu( itemClicked, widget()->mapToGlobal( event->pos() ) );
-      accepted = true; // displayClientMenu can possibly destroy the deco...
-
     }
 
     mouseButton_ = Qt::NoButton;