Fixed tabwidget size calculation from contents

BUG: 364426
wilder-pre-rebase
Hugo Pereira Da Costa 10 years ago
parent e72c1ea295
commit 4fb5a3bf8b
  1. 19
      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<const QStyleOptionTabWidgetFrame*>( 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;

Loading…
Cancel
Save