From 619545e3a7b68757cbb71259783e11c2761ec006 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Mon, 11 Aug 2014 19:37:46 +0200 Subject: [PATCH] use Helper function to get qreal radius from frame Radius set default frame radius to 2 instead of 3 removed TabRadius --- kstyle/breeze.h | 3 +-- kstyle/breezehelper.cpp | 24 ++++++++++++------------ kstyle/breezehelper.h | 4 ++++ kstyle/breezestyle.cpp | 28 ++++++++++++++-------------- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/kstyle/breeze.h b/kstyle/breeze.h index a2ed17c9..2ae31b7a 100644 --- a/kstyle/breeze.h +++ b/kstyle/breeze.h @@ -39,7 +39,7 @@ namespace Breeze // frames Frame_FrameWidth = 2, - Frame_FrameRadius = 3, + Frame_FrameRadius = 2, // layout Layout_TopLevelMarginWidth = 10, @@ -114,7 +114,6 @@ namespace Breeze TabBar_TabMarginWidth = 8, TabBar_TabMinWidth = 80, TabBar_TabMinHeight = 28, - TabBar_TabRadius = 3, TabBar_TabOverlap = 1, TabBar_BaseOverlap = 2, diff --git a/kstyle/breezehelper.cpp b/kstyle/breezehelper.cpp index 093c9992..c506c16b 100644 --- a/kstyle/breezehelper.cpp +++ b/kstyle/breezehelper.cpp @@ -369,7 +369,7 @@ namespace Breeze painter->setRenderHint( QPainter::Antialiasing ); QRectF frameRect( rect ); - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); // set pen if( outline.isValid() ) @@ -412,7 +412,7 @@ namespace Breeze painter->setRenderHint( QPainter::Antialiasing ); QRectF frameRect( rect ); - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); // set pen if( outline.isValid() ) @@ -451,7 +451,7 @@ namespace Breeze { QRectF shadowRect( frameRect.adjusted( 1.5, 1.5, -1.5, -1.5 ).translated( 0, 0.5 ) ); - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 1 ); + const qreal radius( frameRadius() - 1 ); painter->setPen( QPen( shadow, 2 ) ); painter->setBrush( Qt::NoBrush ); @@ -460,7 +460,7 @@ namespace Breeze } // outline - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); frameRect.adjust( 1, 1, -1, -1 ); if( outline.isValid() && !hasFocus ) @@ -502,7 +502,7 @@ namespace Breeze if( sunken ) { - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); painter->setPen( Qt::NoPen ); painter->setBrush( color ); @@ -512,7 +512,7 @@ namespace Breeze } else { - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 1.0 ); + const qreal radius( frameRadius() - 1.0 ); painter->setPen( color ); painter->setBrush( Qt::NoBrush ); @@ -532,7 +532,7 @@ namespace Breeze if( !outline.isValid() ) return; // round radius - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 1.0 ); + const qreal radius( frameRadius() - 1.0 ); const QSizeF cornerSize( 2*radius, 2*radius ); QRectF baseRect( rect ); @@ -571,7 +571,7 @@ namespace Breeze painter->setRenderHint( QPainter::Antialiasing ); QRectF frameRect( rect.adjusted( 1, 1, -1, -1 ) ); - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); // set pen if( outline.isValid() ) @@ -606,7 +606,7 @@ namespace Breeze if( color.isValid() ) { // content - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); const QRectF contentRect( baseRect ); QPainterPath path( roundedPath( contentRect, radius, corners ) ); painter->setPen( Qt::NoPen ); @@ -661,7 +661,7 @@ namespace Breeze if( !sunken ) { - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 1 ); + const qreal radius( frameRadius() - 1 ); painter->setPen( QPen( shadow, 2 ) ); painter->setBrush( Qt::NoBrush ); @@ -673,7 +673,7 @@ namespace Breeze // content { - const qreal radius( qreal( Metrics::Frame_FrameRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); painter->setPen( QPen( color, 2 ) ); painter->setBrush( Qt::NoBrush ); @@ -1025,7 +1025,7 @@ namespace Breeze painter->setRenderHint( QPainter::Antialiasing, true ); QRectF frameRect( rect ); - const qreal radius( qreal( Metrics::TabBar_TabRadius ) - 0.5 ); + const qreal radius( frameRadius() - 0.5 ); // pen if( outline.isValid() ) diff --git a/kstyle/breezehelper.h b/kstyle/breezehelper.h index e723475f..4e86964d 100644 --- a/kstyle/breezehelper.h +++ b/kstyle/breezehelper.h @@ -226,6 +226,10 @@ namespace Breeze protected: + //! frame radius + qreal frameRadius( void ) const + { return Metrics::Frame_FrameRadius; } + //! return color key for a given color, properly accounting for invalid colors quint64 colorKey( const QColor& color ) const { return color.isValid() ? color.rgba():0; } diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index f87d865f..601e5c50 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -2486,22 +2486,22 @@ namespace Breeze { case QTabBar::RoundedNorth: case QTabBar::TriangularNorth: - if( tabBarSize.width() >= rect.width()-2*Metrics::TabBar_TabRadius ) corners &= ~CornersTop; + if( tabBarSize.width() >= rect.width()-2*Metrics::Frame_FrameRadius ) corners &= ~CornersTop; break; case QTabBar::RoundedSouth: case QTabBar::TriangularSouth: - if( tabBarSize.width() >= rect.width()-2*Metrics::TabBar_TabRadius ) corners &= ~CornersBottom; + if( tabBarSize.width() >= rect.width()-2*Metrics::Frame_FrameRadius ) corners &= ~CornersBottom; break; case QTabBar::RoundedWest: case QTabBar::TriangularWest: - if( tabBarSize.height() >= rect.height()-2*Metrics::TabBar_TabRadius ) corners &= ~CornersLeft; + if( tabBarSize.height() >= rect.height()-2*Metrics::Frame_FrameRadius ) corners &= ~CornersLeft; break; case QTabBar::RoundedEast: case QTabBar::TriangularEast: - if( tabBarSize.height() >= rect.height()-2*Metrics::TabBar_TabRadius ) corners &= ~CornersRight; + if( tabBarSize.height() >= rect.height()-2*Metrics::Frame_FrameRadius ) corners &= ~CornersRight; break; default: break; @@ -4433,14 +4433,14 @@ namespace Breeze if( selected ) { corners = CornerTopLeft|CornerTopRight; - rect.adjust( 0, 0, 0, Metrics::TabBar_TabRadius ); + rect.adjust( 0, 0, 0, Metrics::Frame_FrameRadius ); } else { rect.adjust( 0, 0, 0, -1 ); if( isFirst ) corners |= CornerTopLeft; if( isLast ) corners |= CornerTopRight; - if( isRightOfSelected ) rect.adjust( -Metrics::TabBar_TabRadius, 0, 0, 0 ); + if( isRightOfSelected ) rect.adjust( -Metrics::Frame_FrameRadius, 0, 0, 0 ); if( isLeftOfSelected ) rect.adjust( 0, 0, Metrics::TabBar_TabOverlap, 0 ); else if( !isLast ) rect.adjust( 0, 0, Metrics::TabBar_TabOverlap, 0 ); @@ -4452,14 +4452,14 @@ namespace Breeze if( selected ) { corners = CornerBottomLeft|CornerBottomRight; - rect.adjust( 0, -Metrics::TabBar_TabRadius, 0, 0 ); + rect.adjust( 0, -Metrics::Frame_FrameRadius, 0, 0 ); } else { rect.adjust( 0, 1, 0, 0 ); if( isFirst ) corners |= CornerBottomLeft; if( isLast ) corners |= CornerBottomRight; - if( isRightOfSelected ) rect.adjust( -Metrics::TabBar_TabRadius, 0, 0, 0 ); + if( isRightOfSelected ) rect.adjust( -Metrics::Frame_FrameRadius, 0, 0, 0 ); if( isLeftOfSelected ) rect.adjust( 0, 0, Metrics::TabBar_TabOverlap, 0 ); else if( !isLast ) rect.adjust( 0, 0, Metrics::TabBar_TabOverlap, 0 ); @@ -4471,15 +4471,15 @@ namespace Breeze if( selected ) { corners = CornerTopLeft|CornerBottomLeft; - rect.adjust( 0, 0, Metrics::TabBar_TabRadius, 0 ); + rect.adjust( 0, 0, Metrics::Frame_FrameRadius, 0 ); } else { rect.adjust( 0, 0, -1, 0 ); if( isFirst ) corners |= CornerTopLeft; if( isLast ) corners |= CornerBottomLeft; - if( isRightOfSelected ) rect.adjust( 0, -Metrics::TabBar_TabRadius, 0, 0 ); - if( isLeftOfSelected ) rect.adjust( 0, 0, 0, Metrics::TabBar_TabRadius ); + if( isRightOfSelected ) rect.adjust( 0, -Metrics::Frame_FrameRadius, 0, 0 ); + if( isLeftOfSelected ) rect.adjust( 0, 0, 0, Metrics::Frame_FrameRadius ); else if( !isLast ) rect.adjust( 0, 0, 0, Metrics::TabBar_TabOverlap ); } @@ -4491,15 +4491,15 @@ namespace Breeze { corners = CornerTopRight|CornerBottomRight; - rect.adjust( -Metrics::TabBar_TabRadius, 0, 0, 0 ); + rect.adjust( -Metrics::Frame_FrameRadius, 0, 0, 0 ); } else { rect.adjust( 1, 0, 0, 0 ); if( isFirst ) corners |= CornerTopRight; if( isLast ) corners |= CornerBottomRight; - if( isRightOfSelected ) rect.adjust( 0, -Metrics::TabBar_TabRadius, 0, 0 ); - if( isLeftOfSelected ) rect.adjust( 0, 0, 0, Metrics::TabBar_TabRadius ); + if( isRightOfSelected ) rect.adjust( 0, -Metrics::Frame_FrameRadius, 0, 0 ); + if( isLeftOfSelected ) rect.adjust( 0, 0, 0, Metrics::Frame_FrameRadius ); else if( !isLast ) rect.adjust( 0, 0, 0, Metrics::TabBar_TabOverlap ); }