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

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/runtime/kstyles/oxygen
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-04-10 2:57:30
Message-ID: 20100410025730.E00B0AC892 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1113217 by hpereiradacosta:

backport r1113212
do not draw hover rect on disabled menubar items, consistently with menus and toolbars


 M  +4 -2      oxygen.cpp  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/oxygen.cpp #1113216:1113217
@@ -1027,9 +1027,11 @@
     {
         case MenuBarItem::Panel:
         {
-            bool active  = flags & State_Selected;
+            const bool enabled  = flags & State_Enabled;
+            const bool active  = flags & State_Selected;
+            if( !enabled ) return true;
 
-            bool animated( animations().menuBarEngine().isAnimated(widget, r.topLeft() ) );
+            const bool animated( animations().menuBarEngine().isAnimated(widget, r.topLeft() ) );
             qreal opacity( animations().menuBarEngine().opacity( widget, r.topLeft() ) );
             QRect currentRect( animations().menuBarEngine().currentRect( widget, r.topLeft() ) );
 
[prev in list] [next in list] [prev in thread] [next in thread]