diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 4354f210..06d5eeff 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -2817,22 +2817,8 @@ namespace Breeze } //______________________________________________________________ - QSize Style::tabWidgetSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* ) const - { - - // cast option and check - const QStyleOptionTabWidgetFrame* tabOption = qstyleoption_cast( option ); - if( !tabOption ) return expandSize( contentsSize, Metrics::Frame_FrameWidth ); - - // tab orientation - const bool verticalTabs( tabOption && isVerticalTab( tabOption->shape ) ); - - // need to reduce the size in the tabbar direction, due to a bug in QTabWidget::minimumSize - return verticalTabs ? - expandSize( contentsSize, Metrics::Frame_FrameWidth, Metrics::Frame_FrameWidth - 1 ): - expandSize( contentsSize, Metrics::Frame_FrameWidth - 1, Metrics::Frame_FrameWidth ); - - } + QSize Style::tabWidgetSizeFromContents( const QStyleOption*, const QSize& contentsSize, const QWidget* ) const + { return expandSize( contentsSize, Metrics::TabWidget_MarginWidth ); } //______________________________________________________________ QSize Style::tabBarTabSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* ) const @@ -4472,7 +4458,6 @@ namespace Breeze // call base class method ParentStyleClass::drawControl( CE_ComboBoxLabel, option, painter, widget ); #endif - return true;