From 60e830d183a367a10f8ad795381cd6dce097402e Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
Date: Fri, 1 Aug 2014 11:30:26 +0200
Subject: [PATCH] adjusted tab margins

---
 kstyle/breezemetrics.h |  3 ++-
 kstyle/breezestyle.cpp | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/kstyle/breezemetrics.h b/kstyle/breezemetrics.h
index 21c3968d..1376b956 100644
--- a/kstyle/breezemetrics.h
+++ b/kstyle/breezemetrics.h
@@ -75,7 +75,8 @@ namespace Breeze
         Slider_ControlThickness = 20,
 
         // tabbar
-        TabBar_TabMarginWidth = 4,
+        TabBar_TabMarginHeight = 4,
+        TabBar_TabMarginWidth = 8,
         TabBar_TabMinWidth = 80,
         TabBar_TabMinHeight = 28,
         TabBar_TabRadius = 3,
diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index 390e8474..b81d8b96 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -261,7 +261,7 @@ namespace Breeze
             case PM_TabBarTabOverlap: return Metrics::TabBar_TabOverlap;
             case PM_TabBarBaseOverlap: return Metrics::TabBar_BaseOverlap;
             case PM_TabBarTabHSpace: return 2*Metrics::TabBar_TabMarginWidth;
-            case PM_TabBarTabVSpace: return 2*Metrics::TabBar_TabMarginWidth;
+            case PM_TabBarTabVSpace: return 2*Metrics::TabBar_TabMarginHeight;
 
             // scrollbars
             case PM_ScrollBarExtent: return Metrics::ScrollBar_Extend;
@@ -1468,12 +1468,23 @@ namespace Breeze
         const QStyleOptionTab *tabOption( qstyleoption_cast<const QStyleOptionTab*>( option ) );
 
         // add margins
-        QSize size( expandSize( contentsSize, Metrics::TabBar_TabMarginWidth ) );
+        // QSize size( expandSize( contentsSize, Metrics::TabBar_TabMarginWidth ) );
+        QSize size( contentsSize );
 
         // compare to minimum size
         const bool verticalTabs( tabOption && isVerticalTab( tabOption ) );
-        if( verticalTabs ) size = size.expandedTo( QSize( Metrics::TabBar_TabMinHeight, Metrics::TabBar_TabMinWidth ) );
-        else size = size.expandedTo( QSize( Metrics::TabBar_TabMinWidth, Metrics::TabBar_TabMinHeight ) );
+        if( verticalTabs )
+        {
+
+            size += QSize( 2*Metrics::TabBar_TabMarginHeight, 2*Metrics::TabBar_TabMarginWidth );
+            size = size.expandedTo( QSize( Metrics::TabBar_TabMinHeight, Metrics::TabBar_TabMinWidth ) );
+
+        } else {
+
+            size += QSize( 2*Metrics::TabBar_TabMarginWidth, 2*Metrics::TabBar_TabMarginHeight );
+            size = size.expandedTo( QSize( Metrics::TabBar_TabMinWidth, Metrics::TabBar_TabMinHeight ) );
+
+        }
 
         return size;