diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-08 15:38:47 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-08 15:38:47 -0500 |
| commit | 785106b36c47923c338b6d3d61584eea448863ca (patch) | |
| tree | 6b2bbbde4a5ff5e43c1c9ec31ad0bd72ea43e0df /src/styles/qcdestyle.cpp | |
| parent | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (diff) | |
| parent | 43db215f601fd50f1fd8b502fae30c75c1bdee4a (diff) | |
| download | tqt3-785106b36c47923c338b6d3d61584eea448863ca.tar.gz tqt3-785106b36c47923c338b6d3d61584eea448863ca.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/styles/qcdestyle.cpp')
| -rw-r--r-- | src/styles/qcdestyle.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp index 7a4f2693..1b01c81d 100644 --- a/src/styles/qcdestyle.cpp +++ b/src/styles/qcdestyle.cpp @@ -87,7 +87,7 @@ TQCDEStyle::~TQCDEStyle() /*!\reimp */ -int TQCDEStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) const +int TQCDEStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const { int ret; @@ -102,7 +102,7 @@ int TQCDEStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) const ret = 13; break; default: - ret = TQMotifStyle::pixelMetric( metric, widget ); + ret = TQMotifStyle::pixelMetric( metric, ceData, elementFlags, widget ); break; } return ret; @@ -112,11 +112,13 @@ int TQCDEStyle::pixelMetric( PixelMetric metric, const TQWidget *widget ) const */ void TQCDEStyle::drawControl( ControlElement element, TQPainter *p, - const TQWidget *widget, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how, - const TQStyleOption& opt ) const + const TQStyleOption& opt, + const TQWidget *widget ) const { switch( element ) { @@ -127,11 +129,11 @@ void TQCDEStyle::drawControl( ControlElement element, &cg.brush( TQColorGroup::Button ) ); else // other item p->fillRect( r, cg.brush( TQColorGroup::Button ) ); - TQCommonStyle::drawControl( element, p, widget, r, cg, how, opt ); + TQCommonStyle::drawControl( element, p, ceData, elementFlags, r, cg, how, opt, widget ); break; } default: - TQMotifStyle::drawControl( element, p, widget, r, cg, how, opt ); + TQMotifStyle::drawControl( element, p, ceData, elementFlags, r, cg, how, opt, widget ); break; } @@ -142,6 +144,8 @@ void TQCDEStyle::drawControl( ControlElement element, */ void TQCDEStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, + TQStyleControlElementData ceData, + ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags, @@ -154,7 +158,7 @@ void TQCDEStyle::drawPrimitive( PrimitiveElement pe, bool on = flags & Style_On; bool showUp = !( down ^ on ); TQBrush fill = showUp || flags & Style_NoChange ? cg.brush( TQColorGroup::Button ) : cg.brush( TQColorGroup::Mid ); - qDrawShadePanel( p, r, cg, !showUp, pixelMetric( PM_DefaultFrameWidth ), &cg.brush( TQColorGroup::Button ) ); + qDrawShadePanel( p, r, cg, !showUp, pixelMetric( PM_DefaultFrameWidth, ceData, elementFlags ), &cg.brush( TQColorGroup::Button ) ); if ( !( flags & Style_Off ) ) { TQPointArray a( 7 * 2 ); @@ -360,7 +364,7 @@ void TQCDEStyle::drawPrimitive( PrimitiveElement pe, } break; default: - TQMotifStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + TQMotifStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); } } |