wilderjds
/
breeze
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added 'missing' Metrics::

Browse Source
wilder-pre-rebase
Hugo Pereira Da Costa 12 years ago
parent bbc6a51d9d
commit 84855a54b9
2 changed files with 18 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      kstyle/breezestyle.cpp
  2. 29
      kstyle/breezestyle.h

25
kstyle/breezestyle.cpp
Unescape View File

@ -438,19 +438,19 @@ namespace Breeze
// frame width
case PM_DefaultFrameWidth:
if( qobject_cast<const QLineEdit*>( widget ) ) return LineEdit_FrameWidth;
if( qobject_cast<const QLineEdit*>( widget ) ) return Metrics::LineEdit_FrameWidth;
#if QT_VERSION >= 0x050000
else if( option && option->styleObject && option->styleObject->inherits( "QQuickStyleItem" ) )
{
const QString &elementType = option->styleObject->property( "elementType" ).toString();
if ( elementType == QLatin1String( "edit" ) || elementType == QLatin1String( "spinbox" ) )
if( elementType == QLatin1String( "edit" ) || elementType == QLatin1String( "spinbox" ) )
{
return LineEdit_FrameWidth;
return Metrics::LineEdit_FrameWidth;
} else if ( elementType == QLatin1String( "combobox" ) ) {
} else if( elementType == QLatin1String( "combobox" ) ) {
return ComboBox_FrameWidth;
return Metrics::ComboBox_FrameWidth;
}
}
@ -525,12 +525,9 @@ namespace Breeze
// toolbars
case PM_ToolBarHandleExtent: return Metrics::ToolBar_HandleExtent;
case PM_ToolBarSeparatorExtent: return Metrics::ToolBar_SeparatorWidth;
// need to make sure there is enough room to draw the icon
case PM_ToolBarExtensionExtent:
return pixelMetric( PM_SmallIconSize, option, widget ) + 2*Metrics::ToolButton_MarginWidth;
// toolbar items
case PM_ToolBarItemMargin: return 0;
case PM_ToolBarItemSpacing: return Metrics::ToolBar_ItemSpacing;
@ -555,10 +552,10 @@ namespace Breeze
case PM_SliderLength: return Metrics::Slider_ControlThickness;
// checkboxes and radio buttons
case PM_IndicatorWidth: return CheckBox_Size;
case PM_IndicatorHeight: return CheckBox_Size;
case PM_ExclusiveIndicatorWidth: return CheckBox_Size;
case PM_ExclusiveIndicatorHeight: return CheckBox_Size;
case PM_IndicatorWidth: return Metrics::CheckBox_Size;
case PM_IndicatorHeight: return Metrics::CheckBox_Size;
case PM_ExclusiveIndicatorWidth: return Metrics::CheckBox_Size;
case PM_ExclusiveIndicatorHeight: return Metrics::CheckBox_Size;
// list heaaders
case PM_HeaderMarkSize: return Metrics::Header_ArrowSize;
@ -720,6 +717,7 @@ namespace Breeze
//______________________________________________________________
QRect Style::subControlRect( ComplexControl element, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const
{
switch( element )
{
@ -2308,7 +2306,7 @@ namespace Breeze
*/
const int tickLength( disableTicks ? 0 : (
Metrics::Slider_TickLength + Metrics::Slider_TickMarginWidth +
(Metrics::Slider_GrooveThickness - Slider_ControlThickness)/2 ) );
(Metrics::Slider_GrooveThickness - Metrics::Slider_ControlThickness)/2 ) );
const int builtInTickLength( 5 );
if( tickPosition == QSlider::NoTicks ) return contentsSize;
@ -5507,6 +5505,7 @@ namespace Breeze
bool Style::drawSliderComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const
{
// cast option and check
const QStyleOptionSlider *sliderOption( qstyleoption_cast<const QStyleOptionSlider*>( option ) );
if( !sliderOption ) return true;

29
kstyle/breezestyle.h
Unescape View File

@ -161,35 +161,18 @@ namespace Breeze
QRect defaultSubElementRect( const QStyleOption* option, const QWidget* ) const
{ return option->rect; }
//* push button contents
QRect pushButtonContentsRect( const QStyleOption* option, const QWidget* ) const;
//* checkbox contents
QRect checkBoxContentsRect( const QStyleOption* option, const QWidget* ) const;
//* line edit contents
QRect lineEditContentsRect( const QStyleOption*, const QWidget* ) const;
//* progressbar groove
QRect progressBarGrooveRect( const QStyleOption* option, const QWidget* ) const;
//* progressbar groove
QRect progressBarContentsRect( const QStyleOption* option, const QWidget* ) const;
//* progressbar label
QRect progressBarLabelRect( const QStyleOption* option, const QWidget* ) const;
//* view headers
QRect headerArrowRect( const QStyleOption* option, const QWidget* ) const;
QRect headerLabelRect( const QStyleOption* option, const QWidget* ) const;
//* tab widgets
QRect tabWidgetTabBarRect( const QStyleOption*, const QWidget* ) const;
QRect tabWidgetTabContentsRect( const QStyleOption*, const QWidget* ) const;
QRect tabWidgetTabPaneRect( const QStyleOption*, const QWidget* ) const;
QRect tabWidgetCornerRect( SubElement, const QStyleOption* option, const QWidget* widget ) const;
//* toolbox tab
QRect toolBoxTabContentsRect( const QStyleOption* option, const QWidget* ) const;
//@}
@ -219,11 +202,11 @@ namespace Breeze
QSize spinBoxSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize sliderSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize pushButtonSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize menuBarItemSizeFromContents( const QStyleOption*, const QSize& size, const QWidget* ) const;
QSize menuItemSizeFromContents( const QStyleOption*, const QSize& size, const QWidget* ) const;
QSize menuBarItemSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize menuItemSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize progressBarSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize tabWidgetSizeFromContents( const QStyleOption*, const QSize& size, const QWidget* ) const;
QSize tabBarTabSizeFromContents( const QStyleOption*, const QSize& size, const QWidget* ) const;
QSize tabWidgetSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize tabBarTabSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize toolButtonSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize headerSectionSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize itemViewItemSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
@ -408,8 +391,8 @@ namespace Breeze
switch( type )
{
case NoButton: return Metrics::ScrollBar_NoButtonHeight;
case SingleButton: return ScrollBar_SingleButtonHeight;
case DoubleButton: return ScrollBar_DoubleButtonHeight;
case SingleButton: return Metrics::ScrollBar_SingleButtonHeight;
case DoubleButton: return Metrics::ScrollBar_DoubleButtonHeight;
default: return 0;
}
}

Write Preview
Loading…
Cancel
Save