Align decoration buttons rendering between style and decoration.

kdecoration/breezesettingsdata.kcfg

@@ -19,6 +19,11 @@
        <max>64</max>
     </entry>
 
+    <!-- close button -->
+    <entry name="OutlineCloseButton" type = "Bool">
+        <default>true</default>
+    </entry>
+
   </group>
 
   <group name="Windeco">
@@ -65,11 +70,6 @@
       <default>ButtonDefault</default>
     </entry>
 
-    <!-- close button -->
-    <entry name="OutlineCloseButton" type = "Bool">
-        <default>true</default>
-    </entry>
-
     <!-- maximized windows -->
     <entry name="DrawBorderOnMaximizedWindows" type = "Bool">
         <default>false</default>

kstyle/breeze.kcfg

@@ -21,6 +21,11 @@
        <max>64</max>
     </entry>
 
+    <!-- close button -->
+    <entry name="OutlineCloseButton" type = "Bool">
+        <default>true</default>
+    </entry>
+
   </group>
 
   <!-- widget style -->

kstyle/breezehelper.cpp

@@ -802,7 +802,6 @@ namespace Breeze
         {
 
             frameRect.translate(1, 1);
-            // painter->translate( 1, 1 );
 
         } else {
 
@@ -1296,18 +1295,19 @@ namespace Breeze
             case ButtonMaximize:
             {
                 painter->drawPolyline( QPolygonF()
-                    << QPointF( 4.5, 10.5 )
+                    << QPointF( 4, 11 )
-                    << QPointF( 9, 6.5 )
+                    << QPointF( 9, 6 )
-                    << QPointF( 13.5, 10.5 ) );
+                    << QPointF( 14, 11 ) );
                 break;
             }
 
             case ButtonMinimize:
             {
+
                 painter->drawPolyline( QPolygonF()
-                    << QPointF( 4.5, 7.5 )
+                    << QPointF( 4, 7 )
-                    << QPointF( 9, 11.5 )
+                    << QPointF( 9, 12 )
-                    << QPointF( 13.5, 7.5 ) );
+                    << QPointF( 14, 7 ) );
                 break;
             }
 

kstyle/breezestyle.cpp

@@ -6401,13 +6401,15 @@ namespace Breeze
         else if( widget ) palette = widget->palette();
         else palette = QApplication::palette();
 
+        const bool isCloseButton( buttonType == ButtonClose && StyleConfigData::outlineCloseButton() );
+
         palette.setCurrentColorGroup( QPalette::Active );
         const QColor base( palette.color( QPalette::WindowText ) );
         const QColor selected( palette.color( QPalette::HighlightedText ) );
-        const QColor negative( ( buttonType == ButtonClose ) ? _helper->negativeText( palette ):base );
+        const QColor negative( buttonType == ButtonClose ? _helper->negativeText( palette ):base );
-        const QColor negativeSelected( ( buttonType == ButtonClose ) ? _helper->negativeText( palette ):selected );
+        const QColor negativeSelected( buttonType == ButtonClose ? _helper->negativeText( palette ):selected );
 
-        const bool invertNormalState( buttonType == ButtonClose );
+        const bool invertNormalState( isCloseButton );
 
         // convenience class to map color to icon mode
         struct IconData