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

implemented spinboxes

Browse Source
wilder-pre-rebase
Hugo Pereira Da Costa 12 years ago
parent 8211a5ba12
commit e31137f377
3 changed files with 191 additions and 28 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. 3
      kstyle/breezemetrics.h
  2. 199
      kstyle/breezestyle.cpp
  3. 17
      kstyle/breezestyle.h

3
kstyle/breezemetrics.h
Unescape View File

@ -41,6 +41,9 @@ namespace Breeze
ComboBox_ButtonWidth = 20,
ComboBox_BoxTextSpace = 8,
// spinbox
SpinBox_ButtonWidth = 20,
// groupbox title margin
GroupBox_TitleMarginWidth = 4,

199
kstyle/breezestyle.cpp
Unescape View File

@ -291,13 +291,9 @@ namespace Breeze
switch( element )
{
// groupbox
case CC_GroupBox: return groupBoxSubControlRect( option, subControl, widget );
// combobox
case CC_ComboBox: return comboBoxSubControlRect( option, subControl, widget );
// scrollbar
case CC_SpinBox: return spinBoxSubControlRect( option, subControl, widget );
case CC_ScrollBar: return scrollBarSubControlRect( option, subControl, widget );
// fallback
@ -314,20 +310,12 @@ namespace Breeze
switch( element )
{
// checkboxes and radio buttons
case CT_CheckBox: return checkBoxSizeFromContents( option, size, widget );
case CT_RadioButton: return checkBoxSizeFromContents( option, size, widget );
// line edit
case CT_LineEdit: return lineEditSizeFromContents( option, size, widget );
// comboboxes
case CT_ComboBox: return comboBoxSizeFromContents( option, size, widget );
// push buttons
case CT_SpinBox: return spinBoxSizeFromContents( option, size, widget );
case CT_PushButton: return pushButtonSizeFromContents( option, size, widget );
// progress bar
case CT_ProgressBar: return progressBarSizeFromContents( option, size, widget );
// fallback
@ -486,6 +474,7 @@ namespace Breeze
{
case CC_ComboBox: fcn = &Style::drawComboBoxComplexControl; break;
case CC_SpinBox: fcn = &Style::drawSpinBoxComplexControl; break;
case CC_Slider: fcn = &Style::drawSliderComplexControl; break;
// fallback
@ -869,6 +858,65 @@ namespace Breeze
}
//___________________________________________________________________________________________________________________
QRect Style::spinBoxSubControlRect( const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const
{
QRect rect( option->rect );
switch( subControl )
{
case SC_SpinBoxFrame: return rect;
case SC_SpinBoxUp:
case SC_SpinBoxDown:
{
// take out frame width
rect = insideMargin( rect, Metrics::Frame_FrameWidth );
QRect arrowRect;
arrowRect = QRect(
rect.right() - Metrics::SpinBox_ButtonWidth,
rect.top(),
Metrics::SpinBox_ButtonWidth,
rect.height() );
arrowRect = centerRect( arrowRect, Metrics::SpinBox_ButtonWidth, Metrics::SpinBox_ButtonWidth );
arrowRect.setHeight( Metrics::SpinBox_ButtonWidth/2 );
if( subControl == SC_SpinBoxDown ) arrowRect.translate( 0, Metrics::SpinBox_ButtonWidth/2 );
return handleRTL( option, arrowRect );
}
case SC_SpinBoxEditField:
{
// take out frame width
rect = insideMargin( rect, Metrics::Frame_FrameWidth );
QRect labelRect;
labelRect = QRect(
rect.left(), rect.top(),
rect.width() - Metrics::SpinBox_ButtonWidth,
rect.height() );
// remove line editor margins
labelRect.adjust( Metrics::LineEdit_MarginWidth, Metrics::LineEdit_MarginWidth, 0, -Metrics::LineEdit_MarginWidth );
return handleRTL( option, labelRect );
}
default: break;
}
return KStyle::subControlRect( CC_SpinBox, option, subControl, widget );
}
//___________________________________________________________________________________________________________________
QRect Style::scrollBarInternalSubControlRect( const QStyleOptionComplex* option, SubControl subControl ) const
{
@ -1010,7 +1058,7 @@ namespace Breeze
}
//______________________________________________________________
QSize Style::lineEditSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* widget ) const
QSize Style::lineEditSizeFromContents( const QStyleOption* option, const QSize& contentsSize, const QWidget* ) const
{
// cast option and check
const QStyleOptionFrame* frameOption( qstyleoption_cast<const QStyleOptionFrame*>( option ) );
@ -1048,6 +1096,26 @@ namespace Breeze
return expandSize( size, Metrics::Frame_FrameWidth );
}
//______________________________________________________________
QSize Style::spinBoxSizeFromContents( const QStyleOption*, const QSize& contentsSize, const QWidget* ) const
{
QSize size( contentsSize );
// add editor margins
size = expandSize( size, Metrics::LineEdit_MarginWidth );
// make sure there is enough height for the button
size.setHeight( qMax( size.height(), (int)Metrics::SpinBox_ButtonWidth ) );
// add button width and spacing
size.rwidth() += Metrics::SpinBox_ButtonWidth;
// add framewidth
return expandSize( size, Metrics::Frame_FrameWidth );
}
//______________________________________________________________
QSize Style::pushButtonSizeFromContents( const QStyleOption*, const QSize& contentsSize, const QWidget* ) const
{ return expandSize( contentsSize, Metrics::Button_MarginWidth + Metrics::Frame_FrameWidth ); }
@ -1882,7 +1950,7 @@ namespace Breeze
const bool editable( comboBoxOption->editable );
// frame
if( comboBoxOption->subControls & SC_ComboBoxFrame )
if( option->subControls & SC_ComboBoxFrame )
{
if( editable )
@ -1933,7 +2001,7 @@ namespace Breeze
}
// arrow
if( comboBoxOption->subControls & SC_ComboBoxArrow )
if( option->subControls & SC_ComboBoxArrow )
{
// detect empty comboboxes
@ -1964,6 +2032,37 @@ namespace Breeze
}
//______________________________________________________________
bool Style::drawSpinBoxComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const
{
const QStyleOptionSpinBox *spinBoxOption( qstyleoption_cast<const QStyleOptionSpinBox *>( option ) );
if( !spinBoxOption ) return true;
const State& flags( option->state );
const QPalette& palette( option->palette );
const bool enabled( flags & State_Enabled );
const bool mouseOver( enabled && ( flags & State_MouseOver ) );
const bool hasFocus( flags & State_HasFocus );
if( option->subControls & SC_SpinBoxFrame )
{
QColor outline;
if( mouseOver ) outline = _helper->viewHoverBrush().brush( palette ).color();
else if( hasFocus ) outline = _helper->viewHoverBrush().brush( palette ).color();
else outline = KColorUtils::mix( palette.color( QPalette::Window ), palette.color( QPalette::WindowText ), 0.25 );
// render
_helper->renderFrame( painter, option->rect, palette.color( QPalette::Base ), outline, hasFocus );
}
if( option->subControls & SC_SpinBoxUp ) renderSpinBoxArrow( painter, spinBoxOption, widget, SC_SpinBoxUp );
if( option->subControls & SC_SpinBoxDown ) renderSpinBoxArrow( painter, spinBoxOption, widget, SC_SpinBoxDown );
return true;
}
//______________________________________________________________
bool Style::drawSliderComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const
{
@ -2104,6 +2203,72 @@ namespace Breeze
}
//____________________________________________________________________________________________________
void Style::renderSpinBoxArrow( QPainter* painter, const QStyleOptionSpinBox* option, const QWidget* widget, const SubControl& subControl ) const
{
const QPalette& palette( option->palette );
const State& flags( option->state );
// enable state
bool enabled( flags & State_Enabled );
// check steps enable step
const bool atLimit(
(subControl == SC_SpinBoxUp && !(option->stepEnabled & QAbstractSpinBox::StepUpEnabled )) ||
(subControl == SC_SpinBoxDown && !(option->stepEnabled & QAbstractSpinBox::StepDownEnabled ) ) );
// update enabled state accordingly
enabled &= !atLimit;
// update mouse-over effect
const bool mouseOver( enabled && ( flags & State_MouseOver ) );
// check animation state
const bool subControlHover( enabled && mouseOver && ( option->activeSubControls & subControl ) );
// _animations->spinBoxEngine().updateState( widget, subControl, subControlHover );
//
// const bool animated( enabled && _animations->spinBoxEngine().isAnimated( widget, subControl ) );
// const qreal opacity( _animations->spinBoxEngine().opacity( widget, subControl ) );
QColor color;
// if( animated )
// {
//
// QColor highlight = _helper->viewHoverBrush().brush( palette ).color();
// color = KColorUtils::mix( palette.color( QPalette::Text ), highlight, opacity );
//
// } else if( subControlHover ) {
if( subControlHover ) {
color = _helper->viewHoverBrush().brush( palette ).color();
} else if( atLimit ) {
color = palette.color( QPalette::Disabled, QPalette::Text );
} else {
color = palette.color( QPalette::Text );
}
const QPolygonF a( genericArrow( ( subControl == SC_SpinBoxUp ) ? ArrowUp:ArrowDown, ArrowNormal ) );
const QRectF arrowRect( subControlRect( CC_SpinBox, option, subControl, widget ) );
painter->save();
painter->translate( arrowRect.center() );
painter->setRenderHint( QPainter::Antialiasing );
const qreal penThickness = 1.6;
painter->setPen( QPen( color, penThickness ) );
painter->drawPolyline( a );
painter->restore();
return;
}
//______________________________________________________________________________
QWidget* Style::scrollBarParent( const QWidget* widget ) const
{

17
kstyle/breezestyle.h
Unescape View File

@ -223,21 +223,12 @@ namespace Breeze
//!@name subcontrol Rect specialized functions
//@{
//! groupbox
QRect groupBoxSubControlRect( const QStyleOptionComplex*, SubControl, const QWidget* ) const;
//! combobox
QRect comboBoxSubControlRect( const QStyleOptionComplex*, SubControl, const QWidget* ) const;
//! scrollbar (internal)
QRect spinBoxSubControlRect( const QStyleOptionComplex*, SubControl, const QWidget* ) const;
QRect scrollBarInternalSubControlRect( const QStyleOptionComplex*, SubControl ) const;
//! scrollbar
QRect scrollBarSubControlRect( const QStyleOptionComplex*, SubControl, const QWidget* ) const;
//! spinbox
// QRect spinBoxSubControlRect( const QStyleOptionComplex*, SubControl, const QWidget* ) const;
//@}
//!@name sizeFromContents
@ -246,6 +237,7 @@ namespace Breeze
QSize checkBoxSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
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 pushButtonSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
// QSize headerSectionSizeFromContents( const QStyleOption*, const QSize&, const QWidget* ) const;
@ -357,9 +349,9 @@ namespace Breeze
//!@name complex ontrols specialized functions
//@{
bool drawComboBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawSpinBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
// bool drawDialComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
bool drawSliderComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
// bool drawSpinBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
// bool drawTitleBarComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
// bool drawToolButtonComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const;
//@}
@ -435,6 +427,9 @@ namespace Breeze
//! scrollbar arrow
void renderScrollBarArrow( QPainter*, const QRect&, const QColor& color, ArrowOrientation ) const;
//! spinbox arrows
void renderSpinBoxArrow( QPainter*, const QStyleOptionSpinBox*, const QWidget*, const SubControl& ) const;
//! scrollbar buttons
enum ScrollBarButtonType
{

Write Preview
Loading…
Cancel
Save