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

Properly handle our own slider tick length

Browse Source
wilder-pre-rebase
Hugo Pereira Da Costa 12 years ago
parent 5f774e3c22
commit bbff964c47
4 changed files with 57 additions and 12 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. 4
      kstyle/breeze.h
  2. 6
      kstyle/breezehelper.cpp
  3. 58
      kstyle/breezestyle.cpp
  4. 1
      kstyle/breezestyle.h

4
kstyle/breeze.h
Unescape View File

@ -127,7 +127,9 @@ namespace Breeze
TitleBar_MarginWidth = 4,
// sliders
Slider_Thickness = 6,
Slider_TickLength = 8,
Slider_TickMarginWidth = 2,
Slider_GrooveThickness = 6,
Slider_ControlThickness = 20,
// tabbar

6
kstyle/breezehelper.cpp
Unescape View File

@ -804,7 +804,7 @@ namespace Breeze
painter->setRenderHint( QPainter::Antialiasing, true );
const QRectF baseRect( rect );
const qreal radius( 0.5*Metrics::Slider_Thickness );
const qreal radius( 0.5*Metrics::Slider_GrooveThickness );
// content
if( color.isValid() )
@ -832,7 +832,7 @@ namespace Breeze
// content
if( color.isValid() )
{
const qreal penWidth( Metrics::Slider_Thickness );
const qreal penWidth( Metrics::Slider_GrooveThickness );
const QRectF grooveRect( rect.adjusted( penWidth/2, penWidth/2, -penWidth/2, -penWidth/2 ) );
painter->setPen( QPen( color, penWidth ) );
@ -861,7 +861,7 @@ namespace Breeze
{
// setup groove rect
const qreal penWidth( Metrics::Slider_Thickness );
const qreal penWidth( Metrics::Slider_GrooveThickness );
const QRectF grooveRect( rect.adjusted( penWidth/2, penWidth/2, -penWidth/2, -penWidth/2 ) );
// setup angles

58
kstyle/breezestyle.cpp
Unescape View File

@ -717,6 +717,7 @@ namespace Breeze
case CT_LineEdit: return lineEditSizeFromContents( option, size, widget );
case CT_ComboBox: return comboBoxSizeFromContents( option, size, widget );
case CT_SpinBox: return spinBoxSizeFromContents( option, size, widget );
case CT_Slider: return sliderSizeFromContents( option, size, widget );
case CT_PushButton: return pushButtonSizeFromContents( option, size, widget );
case CT_ToolButton: return toolButtonSizeFromContents( option, size, widget );
case CT_MenuBar: return defaultSizeFromContents( option, size, widget );
@ -2090,7 +2091,7 @@ namespace Breeze
switch( subControl )
{
case QStyle::SC_DialGroove: return insideMargin( rect, (Metrics::Slider_ControlThickness - Metrics::Slider_Thickness)/2 );
case QStyle::SC_DialGroove: return insideMargin( rect, (Metrics::Slider_ControlThickness - Metrics::Slider_GrooveThickness)/2 );
case QStyle::SC_DialHandle:
{
@ -2138,8 +2139,8 @@ namespace Breeze
grooveRect = insideMargin( grooveRect, pixelMetric( PM_DefaultFrameWidth, option, widget ) );
// centering
if( horizontal ) grooveRect = centerRect( grooveRect, grooveRect.width(), Metrics::Slider_Thickness );
else grooveRect = centerRect( grooveRect, Metrics::Slider_Thickness, grooveRect.height() );
if( horizontal ) grooveRect = centerRect( grooveRect, grooveRect.width(), Metrics::Slider_GrooveThickness );
else grooveRect = centerRect( grooveRect, Metrics::Slider_GrooveThickness, grooveRect.height() );
return grooveRect;
}
@ -2236,6 +2237,48 @@ namespace Breeze
}
//______________________________________________________________
QSize Style::sliderSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* ) const
{
// cast option and check
const QStyleOptionSlider *sliderOption( qstyleoption_cast<const QStyleOptionSlider*>( option ) );
if( !sliderOption ) return contentsSize;
// store tick position and orientation
const QSlider::TickPosition& tickPosition( sliderOption->tickPosition );
const bool horizontal( sliderOption->orientation == Qt::Horizontal );
const bool disableTicks( !StyleConfigData::sliderDrawTickMarks() );
/*
Qt adds its own tick length directly inside QSlider.
Take it out and replace by ours, if needed
*/
const int tickLength( disableTicks ? 0 : (
Metrics::Slider_TickLength + Metrics::Slider_TickMarginWidth +
(Metrics::Slider_GrooveThickness - Slider_ControlThickness)/2 ) );
const int builtInTickLength( 5 );
if( tickPosition == QSlider::NoTicks ) return contentsSize;
QSize size( contentsSize );
if( horizontal )
{
if(tickPosition & QSlider::TicksAbove) size.rheight() += tickLength - builtInTickLength;
if(tickPosition & QSlider::TicksBelow) size.rheight() += tickLength - builtInTickLength;
} else {
if(tickPosition & QSlider::TicksAbove) size.rwidth() += tickLength - builtInTickLength;
if(tickPosition & QSlider::TicksBelow) size.rwidth() += tickLength - builtInTickLength;
}
return size;
}
//______________________________________________________________
QSize Style::pushButtonSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* widget ) const
{
@ -5337,7 +5380,6 @@ namespace Breeze
if( interval >= 1 )
{
const int fudge( pixelMetric( PM_SliderLength, option, widget ) / 2 );
const int tickSize( ( horizontal ? (rect.height() - Metrics::Slider_Thickness)/2 : (rect.width()-Metrics::Slider_Thickness)/2 ) - 1 );
int current( sliderOption->minimum );
// store tick lines
@ -5346,13 +5388,13 @@ namespace Breeze
if( horizontal )
{
if( tickPosition == QSlider::TicksAbove || tickPosition == QSlider::TicksBothSides ) tickLines.append( QLine( rect.left(), grooveRect.top() - 2, rect.left(), grooveRect.top() - tickSize - 2 ) );
if( tickPosition == QSlider::TicksBelow || tickPosition == QSlider::TicksBothSides ) tickLines.append( QLine( rect.left(), grooveRect.bottom() + 2, rect.left(), grooveRect.bottom() + tickSize + 2 ) );
if( tickPosition & QSlider::TicksAbove ) tickLines.append( QLine( rect.left(), grooveRect.top() - Metrics::Slider_TickMarginWidth, rect.left(), grooveRect.top() - Metrics::Slider_TickMarginWidth - Metrics::Slider_TickLength ) );
if( tickPosition & QSlider::TicksBelow ) tickLines.append( QLine( rect.left(), grooveRect.bottom() + Metrics::Slider_TickMarginWidth, rect.left(), grooveRect.bottom() + Metrics::Slider_TickMarginWidth + Metrics::Slider_TickLength ) );
} else {
if( tickPosition == QSlider::TicksAbove || tickPosition == QSlider::TicksBothSides ) tickLines.append( QLine( grooveRect.left() - 2, rect.top(), grooveRect.left() - tickSize - 2, rect.top() ) );
if( tickPosition == QSlider::TicksBelow || tickPosition == QSlider::TicksBothSides ) tickLines.append( QLine( grooveRect.right() + 2, rect.top(), grooveRect.right() + tickSize + 2, rect.top() ) );
if( tickPosition & QSlider::TicksAbove ) tickLines.append( QLine( grooveRect.left() - Metrics::Slider_TickMarginWidth, rect.top(), grooveRect.left() - Metrics::Slider_TickMarginWidth - Metrics::Slider_TickLength, rect.top() ) );
if( tickPosition & QSlider::TicksBelow ) tickLines.append( QLine( grooveRect.right() + Metrics::Slider_TickMarginWidth, rect.top(), grooveRect.right() + Metrics::Slider_TickMarginWidth + Metrics::Slider_TickLength, rect.top() ) );
}

1
kstyle/breezestyle.h
Unescape View File

@ -218,6 +218,7 @@ namespace Breeze
QSize lineEditSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
QSize comboBoxSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
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;

Write Preview
Loading…
Cancel
Save