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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kstyles/oxygen
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-06-08 5:15:16
Message-ID: 20100608051516.9ABFFAC8CE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1135739 by hpereiradacosta:

fixed pushbutton frames horizontal extend

 M  +8 -6      oxygenstyle.cpp  


--- trunk/KDE/kdebase/workspace/kstyles/oxygen/oxygenstyle.cpp #1135738:1135739
@@ -147,8 +147,8 @@
 
         setWidgetLayoutProp(WT_PushButton, PushButton::DefaultIndicatorMargin, 0);
         setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin, 5); //also \
                used by toolbutton
-        setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Left, 11);
-        setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Right, 11);
+        setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Left, 8);
+        setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Right, 8);
         setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Top, -1);
         setWidgetLayoutProp(WT_PushButton, PushButton::ContentsMargin + Bot, 0);
         setWidgetLayoutProp(WT_PushButton, PushButton::FocusMargin, 0);
@@ -1236,18 +1236,20 @@
 
                 } else {
 
+                    QRect slabRect(r.adjusted( -1, 0, 1, 0 ) );
+
                     if( enabled && hoverAnimated && !(opts & Sunken ) )
                     {
 
-                        renderButtonSlab( p, r, pal.color(QPalette::Button), opts, \
hoverOpacity, AnimationHover, TileSet::Ring ); +                        \
renderButtonSlab( p, slabRect, pal.color(QPalette::Button), opts, hoverOpacity, \
AnimationHover, TileSet::Ring );  
                     } else if( enabled && !mouseOver && focusAnimated && !(opts & \
Sunken ) ) {  
-                        renderButtonSlab( p, r, pal.color(QPalette::Button), opts, \
focusOpacity, AnimationFocus, TileSet::Ring ); +                        \
renderButtonSlab( p, slabRect, pal.color(QPalette::Button), opts, focusOpacity, \
AnimationFocus, TileSet::Ring );  
                     } else {
 
-                        renderButtonSlab(p, r, pal.color(QPalette::Button), opts);
+                        renderButtonSlab(p, slabRect, pal.color(QPalette::Button), \
opts);  
                     }
 
@@ -6441,7 +6443,7 @@
                 highlight = QLinearGradient(fillRect.topRight(), \
fillRect.topLeft());  
             }
-        }
+        }
 
         if( active) {
 


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