diff options
Diffstat (limited to 'style/baghira.cpp')
| -rw-r--r-- | style/baghira.cpp | 301 |
1 files changed, 173 insertions, 128 deletions
diff --git a/style/baghira.cpp b/style/baghira.cpp index 09397ac..8434cf1 100644 --- a/style/baghira.cpp +++ b/style/baghira.cpp @@ -201,7 +201,7 @@ LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkar // tabDict.setAutoDelete( true ); initialPaletteLoaded = false; qtrcModificationTime = 0; - + // animations kram! progAnimShift = 0; prog2AnimShift = 0; @@ -288,22 +288,22 @@ LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkar default: break; } - + if ( btnBorderImg && btnBorderImg->depth() < 32 ) * btnBorderImg = btnBorderImg->convertDepth( 32 ); - + if ( btnShadowImg && btnShadowImg->depth() < 32 ) * btnShadowImg = btnShadowImg->convertDepth( 32 ); - + if ( buttonGlow && buttonGlow->depth() < 32 ) * buttonGlow = buttonGlow->convertDepth( 32 ); - + if ( combo && combo->depth() < 32 ) * combo = combo->convertDepth( 32 ); - + if ( comboShadow && comboShadow->depth() < 32 ) * comboShadow = comboShadow->convertDepth( 32 ); - + if ( rectbutton && rectbutton->depth() < 32 ) * rectbutton = rectbutton->convertDepth( 32 ); @@ -317,7 +317,7 @@ LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkar slider_top = new TQImage( uic_findImage( "sbslider_top" ) ); slider_btm = new TQImage( uic_findImage( "sbslider_btm" ) ); } - + if ( slider_top->depth() < 32 ) * slider_top = slider_top->convertDepth( 32 ); @@ -329,7 +329,7 @@ LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkar slider_top_shd = new TQImage( uic_findImage( "sbslider_top_shd" ) ); if ( slider_top_shd->depth() < 32 ) * slider_top_shd = slider_top_shd->convertDepth( 32 ); - + slider_btm_shd = new TQImage( uic_findImage( "sbslider_btm_shd" ) ); if ( slider_btm_shd->depth() < 32 ) * slider_btm_shd = slider_btm_shd->convertDepth( 32 ); @@ -343,7 +343,7 @@ LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkar roundFrame = new TQImage( uic_findImage( "roundFrame" ) ); if ( roundFrame->depth() < 32 ) * roundFrame = roundFrame->convertDepth( 32 ); - + menuPix = NULL; tmpBtnPix = NULL; @@ -385,7 +385,7 @@ LiquidStyle::LiquidStyle() : TDEStyle( AllowMenuTransparency | FilledFrameWorkar p.drawLine( 0, i, 63, i ); } } - + if (optionHandler->style() == Brushed) { plainBrush = optionHandler->TintBrush() ? @@ -447,7 +447,7 @@ LiquidStyle::~LiquidStyle() { if (rectbutton) delete rectbutton; delete roundFrame; - + if ( tmpBtnPix ) delete tmpBtnPix; if ( menuPix ) @@ -462,7 +462,7 @@ LiquidStyle::~LiquidStyle() { delete groupShadow; } - + inline void LiquidStyle::updateProgressPos() { progAnimShift = (progAnimShift + 1) % 20; @@ -492,13 +492,18 @@ bool LiquidStyle::isPlain() const { } -void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, - const TQRect &r, const TQColorGroup &cg, - SFlags flags, const TQStyleOption &opt ) const +void LiquidStyle::drawPrimitive( PrimitiveElement pe, + TQPainter *p, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQColorGroup &cg, + SFlags flags, + const TQStyleOption &opt ) const { bool down = flags & Style_Down; bool on = flags & Style_On; - + switch ( pe ) { case PE_TabBarBase: @@ -542,7 +547,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->drawPoint(right-1,y2+3); p->drawLine(x,y2+5,x,bottom); p->drawLine(right,y2+5,right,bottom); - + p->setPen( mid ); p->drawPoint(x+4, y2);p->drawPoint(x+5,y2); p->drawPoint(right-4, y2);p->drawPoint(right-5,y2); @@ -555,7 +560,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->drawPoint(right-2,y2+3); p->drawPoint(x,y2+4);p->drawPoint(x+1,y2+4); p->drawPoint(right,y2+4);p->drawPoint(right+1,y2+4); - + p->setPen(bright); p->drawPoint(x+3,y2);p->drawPoint(right-3,y2); p->drawLine(x+4,y2+2,right-4,y2+2); @@ -718,7 +723,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, bool isHover = currentScrollBar->hasMouse(); bool isPressed = currentScrollBar->draggingSlider(); bool drawSlider = currentScrollBar->minValue() < currentScrollBar->maxValue(); - + // horizontal slider if ( flags & Style_Horizontal ) { @@ -737,7 +742,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, } else painter.drawTiledPixmap( bgR.x(), bgR.y() + 1, bgR.width(), 13, *getPixmap( HSBSliderMidBg ) ); - + // lines painter.setPen( sbBgColor.dark( 110 ) ); painter.drawLine( bgR.x(), bgR.y(), bgR.right(), bgR.y()); @@ -773,7 +778,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, { int extent = currentScrollBar->width(); TQRect bgR( 0, extent, extent, currentScrollBar->height() - extent * 3 + 1 ); - + if ( sbBuffer.size() != currentScrollBar->size() ) const_cast<LiquidStyle*>( this ) -> sbBuffer.resize( currentScrollBar->size() ); TQPainter painter; @@ -789,17 +794,17 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, } else painter.drawTiledPixmap( bgR.x() + 1, bgR.y(), 13, bgR.height(), *getPixmap( VSBSliderMidBg ) ); - + painter.setPen( sbBgColor.dark( 110 ) ); painter.drawLine( bgR.x(), bgR.y(), bgR.x(), bgR.bottom() ); painter.drawLine( bgR.right(), bgR.y(), bgR.right(), bgR.bottom() ); - + // here we are, now the slider if ( pe == PE_ScrollBarSlider && drawSlider ) { int offset = isPressed * ( optionHandler->squeezeSbSlider() + optionHandler->shadowSbSlider()*2); int offset2 = (isPressed * optionHandler->squeezeSbSlider()) + optionHandler->shadowSbSlider()*2; - + painter.drawPixmap( r.x() + 1, r.y() + offset, isPressed ? *getPixmap( VSBSliderTopPressed ) : (isHover || isActive || isOOO) ? *getPixmap( VSBSliderTopActive ) : @@ -827,9 +832,9 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, optionHandler->customColor( CustomSBGroove ) : tqApp->palette().active().background() ); TQColor pixColor = flags & Style_Down ? tqApp->palette().active().button() : c; - - bool drawSlider = currentScrollBar->minValue() < currentScrollBar->maxValue(); - + + bool drawSlider = currentScrollBar->minValue() < currentScrollBar->maxValue(); + if ( flags & Style_Horizontal ) { p->drawTiledPixmap( r.x(), r.y() + 1, r.width(), 13, *getPixmap(drawSlider ? HSBSliderMidBgI : HSBSliderMidBg)); @@ -862,7 +867,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, bool drawSlider = currentScrollBar->minValue() < currentScrollBar->maxValue(); - if ( flags & Style_Horizontal ) + if ( flags & Style_Horizontal ) { if ( top ) { @@ -1021,7 +1026,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, TQWidget* w = (p->device() && p->device()->devType() == TQInternal::Widget) ? (TQWidget*)(p->device()) : 0; TQGroupBox* gb = ::tqt_cast<TQGroupBox*>(w); - + optionHandler->drawGroupBoxShadow() ? bgColor = TQColor(cg.background().dark( 100 + optionHandler->ShadowDarkness() )) : bgColor = TQColor(cg.background()); @@ -1049,7 +1054,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, if (gb->parentWidget()) { const TQPixmap *pix = gb->parentWidget()->paletteBackgroundPixmap(); - + if (optionHandler->drawGroupBoxShadow()) { TQPointArray pa1(3); @@ -1068,7 +1073,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, pa4.setPoint(0, x+5,bottom); pa4.setPoint(1, x,bottom); pa4.setPoint(2, x,bottom-5); - + TQRegion reg2(0,0, r.right(), titleHeight); p->setClipRegion(TQRegion(pa1)+TQRegion(pa2)+TQRegion(pa3)+TQRegion(pa4)+reg2); } @@ -1087,7 +1092,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->setClipRegion(oldClip); p->setClipping(hadClip); } - + //outer rect // top p->setPen( dark ); @@ -1112,7 +1117,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->drawLine(x,y2,x,bottom-5); p->drawLine(right,y2,right,bottom-5); } - + p->setPen( mid ); if (pe == PE_PanelGroupBox) { @@ -1139,7 +1144,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->drawPoint(x+2, bottom - 1); p->drawPoint(x+3, bottom - 1); p->drawPoint(right-2, bottom - 1); p->drawPoint(right-3, bottom - 1); p->drawLine(x + 4, bottom,right - 4, bottom); - + p->setPen(bright); // top stuff if (pe == PE_PanelGroupBox) @@ -1187,7 +1192,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, bool isDialog = optionHandler->TabStyle() == Clever && (p->device() && p->device()->devType() == TQInternal::Widget)&& ((TQWidget*)p->device())->topLevelWidget()->inherits("TQDialog"); - + TQColor bright( cg.background().dark( 110 ) ); TQColor mid( cg.background().dark( 130 ) ); TQColor dark( cg.background().dark( 150 ) ); @@ -1200,7 +1205,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, // vertcal outer lines p->drawLine(x,y2,x,bottom-5); p->drawLine(right,y2,right,bottom-5); - + p->setPen( mid ); // bottom stuff p->drawPoint(x,bottom - 4); p->drawPoint(x+1,bottom - 4); @@ -1212,13 +1217,13 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->drawPoint(x+2, bottom - 1); p->drawPoint(x+3, bottom - 1); p->drawPoint(right-2, bottom - 1); p->drawPoint(right-3, bottom - 1); p->drawLine(x + 4, bottom,right - 4, bottom); - + p->setPen(bright); // top stuff // vertical lines p->drawLine(x+1,y2,x+1,bottom-5); p->drawLine(right-1,y2,right-1,bottom-5); - + // bottom stuff p->drawPoint(x, bottom-3);p->drawPoint(right, bottom-3); p->drawPoint(x+3, bottom);p->drawPoint(right-3, bottom); @@ -1271,7 +1276,7 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, break; //don't draw anything if (!(p->device() && p->device()->devType() == TQInternal::Widget && ::tqt_cast<TQToolBar*>((TQWidget*)p->device()))) { - if ( !( flags & Style_Horizontal ) ) + if ( !( flags & Style_Horizontal ) ) { p->setPen( cg.mid() ); p->drawLine( 4, r.height() / 2, r.width() - 5, r.height() / 2 ); @@ -1357,15 +1362,20 @@ void LiquidStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, p->setBrush( oldBrush ); } else - TDEStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); } } // general switch } -void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, - const TQWidget* widget, const TQRect &r, - const TQColorGroup &cg, SFlags flags, - const TQStyleOption &opt ) const +void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, + TQPainter* p, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQColorGroup &cg, + SFlags flags, + const TQStyleOption &opt, + const TQWidget* widget ) const { switch ( kpe ) { @@ -1432,7 +1442,7 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, int x, y, w, h; r.rect( &x, &y, &w, &h ); if (qstrcmp( tqApp->argv() [ 0 ], "kmix" ) == 0) x = x+3; - if ( ( ( const TQSlider * ) widget ) ->orientation() == TQt::Horizontal ) + if ( ceData.orientation == TQt::Horizontal ) { int x2 = x + w - 1; y = y + ( h - 5 ) / 2; @@ -1471,7 +1481,7 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, p->drawPixmap( r.x(), r.y(), *getPixmap( flags & Style_Enabled ? RadioOffHover : RadioOff)); break; } - if ((( const TQSlider * ) widget ) ->orientation() == TQt::Horizontal) + if ( ceData.orientation == TQt::Horizontal ) (widget && widget->height() < 17) ? p->drawPixmap( r.x(), r.y(), *getPixmap( flags & Style_Enabled ? RadioOffHover : RadioOff)) : p->drawPixmap( r.x(), (optionHandler->style() == Milk) ? r.y() : r.y()+2, *getPixmap( flags & Style_Enabled ? HSlider : HSliderInactive)); else { @@ -1486,13 +1496,13 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, // int radius = ( r.width() - 4 ) / 2; // int centerx = r.x() + r.width() / 2; // int centery = r.y() + r.height() / 2; - // + // // int red, green, blue; // red = ( cg.dark().red() >> 1 ) + ( cg.base().red() >> 1 ); // green = ( cg.dark().green() >> 1 ) + ( cg.base().green() >> 1 ); // blue = ( cg.dark().blue() >> 1 ) + ( cg.base().blue() >> 1 ); // TQColor blendColor( red, green, blue ); - // + // // p->setPen( cg.dark() ); // p->drawLine( r.x() + 1, r.y(), r.right() - 1, r.y() ); // p->drawLine( r.x() + 1, r.bottom(), r.right() - 1, r.bottom() ); @@ -1514,14 +1524,19 @@ void LiquidStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, break; } default: - TDEStyle::drawTDEStylePrimitive( kpe, p, widget, r, cg, flags, opt ); + TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget ); } } -void LiquidStyle::drawControl( ControlElement element, TQPainter *p, - const TQWidget *widget, const TQRect &r, - const TQColorGroup &cg, SFlags flags, - const TQStyleOption &opt ) const +void LiquidStyle::drawControl( ControlElement element, + TQPainter *p, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQColorGroup &cg, + SFlags flags, + const TQStyleOption &opt, + const TQWidget *widget ) const { switch ( element ) { @@ -1536,7 +1551,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, { // tqWarning("%s - %s,%s : %s,%s",tqApp->argv()[0],widget->className(),widget->name(),widget->parentWidget()->className(),widget->parentWidget()->name()); const TQProgressBar *progress = ( const TQProgressBar * ) widget; - TQRect contentsR( subRect( SR_ProgressBarContents, widget ) ); + TQRect contentsR( subRect( SR_ProgressBarContents, ceData, elementFlags, widget ) ); double val = progress->progress(); bool reverse = TQApplication::reverseLayout(); val = val / progress->totalSteps(); @@ -1614,14 +1629,14 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, TQRect rect = r; TQt::ArrowType arrowType = opt.isDefault() ? TQt::DownArrow : opt.arrowType(); - + int shiftX = 0; int shiftY = 0; if (flags & (Style_Down | Style_On)) { - shiftX = pixelMetric(PM_ButtonShiftHorizontal, widget); - shiftY = pixelMetric(PM_ButtonShiftVertical, widget); + shiftX = pixelMetric(PM_ButtonShiftHorizontal, ceData, elementFlags, widget); + shiftY = pixelMetric(PM_ButtonShiftVertical, ceData, elementFlags, widget); } - + if (!opt.isDefault()) { PrimitiveElement pe; @@ -1633,21 +1648,21 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, default: case TQt::DownArrow: pe = PE_ArrowDown; break; } - + rect.moveBy(shiftX, shiftY); - drawPrimitive(pe, p, rect, cg, flags, opt); + drawPrimitive(pe, p, ceData, elementFlags, rect, cg, flags, opt); } else { TQColor btext = TQt::black;//(flags & (Style_Down | Style_On)) ? tqApp->palette().color(TQPalette::Active,TQColorGroup::ButtonText) : toolbutton->paletteForegroundColor(); - + if (toolbutton->iconSet().isNull() && ! toolbutton->text().isNull() && ! toolbutton->usesTextLabel()) { int alignment = AlignCenter | ShowPrefix; - if (!styleHint(SH_UnderlineAccelerator, widget, TQStyleOption::Default, 0)) + if (!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) alignment |= NoAccel; - + rect.moveBy(shiftX, shiftY); drawItem(p, rect, alignment, cg, flags & Style_Enabled, 0, toolbutton->text(), @@ -1667,15 +1682,15 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, else mode = TQIconSet::Normal; pm = toolbutton->iconSet().pixmap( size, mode, state ); - + if ( toolbutton->usesTextLabel() ) { p->setFont( toolbutton->font() ); TQRect pr = rect, tr = rect; int alignment = ShowPrefix; - if (!styleHint(SH_UnderlineAccelerator, widget, TQStyleOption::Default, 0)) + if (!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) alignment |= NoAccel; - + if ( toolbutton->textPosition() == TQToolButton::Under ) { int fh = p->fontMetrics().height(); @@ -1690,11 +1705,11 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, pr.setWidth( pm.width() + 8 ); tr.addCoords( pr.right(), 0, 0, 0 ); pr.moveBy(shiftX, shiftY); - + drawItem( p, pr, AlignCenter, cg, TRUE, &pm, TQString::null ); alignment |= AlignLeft | AlignVCenter; } - + tr.moveBy(shiftX, shiftY); drawItem( p, tr, alignment, cg, flags & Style_Enabled, 0, toolbutton->textLabel(), @@ -1707,7 +1722,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, } } } - + break; }*/ @@ -1717,7 +1732,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, TQRect rect = r; const TQHeader* header = (const TQHeader *) widget; int section = opt.headerSection(); - + TQIconSet* icon = header->iconSet( section ); if ( icon ) { TQPixmap pixmap = icon->pixmap( TQIconSet::Small, @@ -1726,7 +1741,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, int pixw = pixmap.width(); int pixh = pixmap.height(); // "pixh - 1" because of tricky integer division - + TQRect pixRect = rect; pixRect.setY( rect.center().y() - (pixh - 1) / 2 ); drawItem ( p, pixRect, AlignVCenter, cg, flags & Style_Enabled, @@ -1741,7 +1756,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, { if (optionHandler->DrawProgressLabel()) { - TQRect contentsR( subRect( SR_ProgressBarContents, widget ) ); + TQRect contentsR( subRect( SR_ProgressBarContents, ceData, elementFlags, widget ) ); if ( !contentsR.isValid() ) return ; TQFont font( p->font() ); @@ -1768,7 +1783,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, pos = left; else if (tabBar->indexOf(opt.tab()->identifier()) == tabBar->count() - 1) pos = right; - else + else pos = center; TQColor c; @@ -1881,7 +1896,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, if ( !isPlain() && !btn->autoMask() ) const_cast<LiquidStyle*>( this ) ->btnOffset = btn->backgroundOffset(); const_cast<LiquidStyle*>( this ) ->paintWidget = const_cast<TQWidget*>( widget ); - drawPrimitive( PE_ButtonDefault, p, r, cg, flags, TQStyleOption( btn )); + drawPrimitive( PE_ButtonDefault, p, ceData, elementFlags, r, cg, flags, TQStyleOption( btn )); const_cast<LiquidStyle*>( this ) ->paintWidget = 0L; const_cast<LiquidStyle*>( this ) ->isHTMLButton = false; break; @@ -1918,7 +1933,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, if ( btn->isMenuButton() ) { - drawPrimitive( PE_ArrowDown, p, TQRect( w-14, (int)(h/2), 7, 7 ) , cg, flags, opt ); + drawPrimitive( PE_ArrowDown, p, ceData, elementFlags, TQRect( w-14, (int)(h/2), 7, 7 ) , cg, flags, opt ); w -= 14; } TQColor tmp; @@ -2041,7 +2056,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, cflags |= Style_Enabled; if ( act ) cflags |= Style_On; - drawPrimitive( PE_CheckMark, p, visualRect( TQRect( xp, y + windowsItemFrame, checkcol - 2 * windowsItemFrame, h - 2 * windowsItemFrame ), r ), cg, cflags ); + drawPrimitive( PE_CheckMark, p, ceData, elementFlags, visualRect( TQRect( xp, y + windowsItemFrame, checkcol - 2 * windowsItemFrame, h - 2 * windowsItemFrame ), r ), cg, cflags ); } } TQColor discol; @@ -2136,14 +2151,14 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, if ( !dis ) discol = cg.highlightedText(); TQColorGroup g2( discol, cg.highlight(), white, white, dis ? discol : white, discol, white ); - drawPrimitive( arrow, p, vrect, g2, Style_Enabled ); + drawPrimitive( arrow, p, ceData, elementFlags, vrect, g2, Style_Enabled ); } else { if ( !dis ) discol = optionHandler->textColor(); TQColorGroup g2( discol, cg.background(), white, white, dis ? discol : white, discol, white ); - drawPrimitive( arrow, p, vrect, g2, mi->isEnabled() ? Style_Enabled : Style_Default ); + drawPrimitive( arrow, p, ceData, elementFlags, vrect, g2, mi->isEnabled() ? Style_Enabled : Style_Default ); } } break; @@ -2154,7 +2169,7 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, break; }*/ default: - TDEStyle::drawControl( element, p, widget, r, cg, flags, opt ); + TDEStyle::drawControl( element, p, ceData, elementFlags, r, cg, flags, opt, widget ); } } @@ -2182,7 +2197,17 @@ void LiquidStyle::drawControl( ControlElement element, TQPainter *p, // // } // } -void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQColorGroup &cg, SFlags flags, SCFlags controls, SCFlags active, const TQStyleOption &opt ) const +void LiquidStyle::drawComplexControl( ComplexControl control, + TQPainter *p, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQRect &r, + const TQColorGroup &cg, + SFlags flags, + SCFlags controls, + SCFlags active, + const TQStyleOption &opt, + const TQWidget *widget ) const { switch ( control ) { @@ -2249,8 +2274,8 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons const_cast<LiquidStyle*>( this ) ->paintWidget = const_cast<TQWidget*>( widget ); const KAccessToolBarButton *toolbutton2 = 0L; TQRect button, menuarea; - button = querySubControlMetrics( control, widget, SC_ToolButton, opt ); - menuarea = querySubControlMetrics( control, widget, SC_ToolButtonMenu, opt ); + button = querySubControlMetrics( control, ceData, elementFlags, SC_ToolButton, opt, widget ); + menuarea = querySubControlMetrics( control, ceData, elementFlags, SC_ToolButtonMenu, opt, widget ); if (::tqt_cast<TDEToolBarButton*>(toolbutton)) { toolbutton2 = (const KAccessToolBarButton*)toolbutton; @@ -2396,15 +2421,15 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ( controls & SC_ToolButtonMenu ) { if ( mflags & ( Style_Down | Style_On | Style_Raised ) ) - drawPrimitive( PE_ButtonDropDown, p, menuarea, cg, mflags, opt ); - drawPrimitive( PE_ArrowDown, p, menuarea, cg, mflags, opt ); + drawPrimitive( PE_ButtonDropDown, p, ceData, elementFlags, menuarea, cg, mflags, opt ); + drawPrimitive( PE_ArrowDown, p, ceData, elementFlags, menuarea, cg, mflags, opt ); } #if 0 if ( toolbutton->hasFocus() && !toolbutton->focusProxy() ) { TQRect fr = toolbutton->rect(); fr.addCoords( 3, 3, -3, -3 ); - drawPrimitive( PE_FocusRect, p, fr, cg ); + drawPrimitive( PE_FocusRect, p, ceData, elementFlags, fr, cg ); } #endif const_cast<LiquidStyle*>( this ) ->paintWidget = 0L; @@ -2413,7 +2438,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons case CC_ScrollBar: { const_cast<LiquidStyle*>( this ) ->currentScrollBar = ( TQScrollBar * ) widget; - TDEStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); + TDEStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget ); break; } case CC_SpinWidget: { @@ -2436,7 +2461,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons TQRect re = sw->upRect(); TQColorGroup ucg = sw->isUpEnabled() ? cg : sw->palette().disabled(); p->fillRect(re, ucg.base()); - drawPrimitive(pe, p, re, ucg, flags); + drawPrimitive(pe, p, ceData, elementFlags, re, ucg, flags); } if ( controls & SC_SpinWidgetDown ) { @@ -2451,7 +2476,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons TQRect re = sw->downRect(); TQColorGroup dcg = sw->isDownEnabled() ? cg : sw->palette().disabled(); p->fillRect(re, dcg.base()); - drawPrimitive(pe, p, re, dcg, flags); + drawPrimitive(pe, p, ceData, elementFlags, re, dcg, flags); } break; } @@ -2459,8 +2484,8 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons // ------------------------------------------------------------------- case CC_Slider: { const TQSlider* slider = (const TQSlider*)widget; - TQRect groove = querySubControlMetrics(CC_Slider, widget, SC_SliderGroove, opt); - TQRect handle = querySubControlMetrics(CC_Slider, widget, SC_SliderHandle, opt); + TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove, opt, widget); + TQRect handle = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderHandle, opt, widget); // Double-buffer slider for no flicker TQPixmap pix(widget->size()); @@ -2511,23 +2536,23 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons // Draw slider groove if ((controls & SC_SliderGroove) && groove.isValid()) { - drawTDEStylePrimitive( KPE_SliderGroove, &p2, widget, groove, cg, flags, opt ); + drawTDEStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, flags, opt, widget ); // Draw the focus rect around the groove /* if (slider->hasFocus()) - drawPrimitive(PE_FocusRect, &p2, groove, cg);*/ + drawPrimitive(PE_FocusRect, &p2, ceData, elementFlags, groove, cg);*/ } // Draw the tickmarks if (controls & SC_SliderTickmarks) - TQCommonStyle::drawComplexControl(control, &p2, widget, - r, cg, flags, SC_SliderTickmarks, active, opt); + TQCommonStyle::drawComplexControl(control, &p2, ceData, elementFlags, + r, cg, flags, SC_SliderTickmarks, active, opt, widget); // Draw the slider handle if ((controls & SC_SliderHandle) && handle.isValid()) { if (active == SC_SliderHandle) flags |= Style_Active; - drawTDEStylePrimitive( KPE_SliderHandle, &p2, widget, handle, cg, flags, opt ); + drawTDEStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, flags, opt, widget ); } p2.end(); @@ -2538,7 +2563,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons #ifndef QT_NO_LISTVIEW case CC_ListView: { if ( controls & SC_ListView ) { - TQCommonStyle::drawComplexControl( control, p, widget, r, cg, flags, controls, active, opt ); + TQCommonStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget ); } if ( controls & ( SC_ListViewBranch | SC_ListViewExpand ) ) { if ( opt.isDefault() ) @@ -2761,7 +2786,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons } if ( controls & SC_TitleBarLabel ) { - TQRect ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarLabel ), widget ); + TQRect ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarLabel, TQStyleOption::Default, widget ), widget ); p->setPen( cg.text() ); p->drawText(ir.x()+2, ir.y(), ir.width()-2, ir.height(), AlignCenter | AlignVCenter | SingleLine, widget->caption() ); } @@ -2772,7 +2797,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ( controls & SC_TitleBarCloseButton ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarCloseButton ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarCloseButton, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarCloseButton; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(0).dark(120) : optionHandler->titleButtonColor(0), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2781,7 +2806,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons } if ( controls & SC_TitleBarSysMenu ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarSysMenu ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarSysMenu, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarSysMenu; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2791,7 +2816,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ( controls & SC_TitleBarMaxButton ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarMaxButton ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarMaxButton, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarMaxButton; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(2).dark(120) : optionHandler->titleButtonColor(2), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2801,7 +2826,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ( controls & SC_TitleBarMinButton ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarMinButton ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarMinButton, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarMinButton; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(1).dark(120) : optionHandler->titleButtonColor(1), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2810,7 +2835,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons } if ( controls & SC_TitleBarNormalButton ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarNormalButton ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarNormalButton, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarNormalButton; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? optionHandler->titleButtonColor(1).dark(120) : optionHandler->titleButtonColor(1), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2820,7 +2845,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ( controls & SC_TitleBarShadeButton ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarShadeButton ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarShadeButton, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarShadeButton; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2830,7 +2855,7 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons if ( controls & SC_TitleBarUnshadeButton ) { - ir = visualRect( querySubControlMetrics( CC_TitleBar, widget, SC_TitleBarUnshadeButton ), widget ); + ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarUnshadeButton, TQStyleOption::Default, widget ), widget ); down = active & SC_TitleBarUnshadeButton; if (optionHandler->buttonStyle() == Brushed) drawRectangularButton( p, cg, down ? cg.button().dark(120) : cg.button(), ir.x(), ir.y(), ir.width(), ir.height(), down, false, false, full); @@ -2842,13 +2867,18 @@ void LiquidStyle::drawComplexControl( ComplexControl control, TQPainter *p, cons #endif //QT_NO_TITLEBAR default: - TDEStyle::drawComplexControl( control, p, widget, - r, cg, flags, controls, active, opt ); + TDEStyle::drawComplexControl( control, p, ceData, elementFlags, + r, cg, flags, controls, active, opt, widget ); break; } } -int LiquidStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption & opt, TQStyleHintReturn * shr) const +int LiquidStyle::styleHint(StyleHint sh, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQStyleOption & opt, + TQStyleHintReturn * shr, + const TQWidget * w) const { switch (sh) { @@ -2860,20 +2890,26 @@ int LiquidStyle::styleHint(StyleHint sh, const TQWidget * w, const TQStyleOption if (optionHandler->CenterTabs() && !TQApplication::reverseLayout()) return AlignHCenter; else - return TDEStyle::styleHint(sh, w, opt, shr); + return TDEStyle::styleHint(sh, ceData, elementFlags, opt, shr, w); default: - return TDEStyle::styleHint(sh, w, opt, shr); + return TDEStyle::styleHint(sh, ceData, elementFlags, opt, shr, w); } } -TQRect LiquidStyle::subRect( SubRect r, const TQWidget *widget ) const { +TQRect LiquidStyle::subRect( SubRect r, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQWidget *widget ) const { if (r == SR_ComboBoxFocusRect){ - return querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField ); + return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget ); } - return ( TDEStyle::subRect( r, widget ) ); + return ( TDEStyle::subRect( r, ceData, elementFlags, widget ) ); } -int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const +int LiquidStyle::pixelMetric( PixelMetric m, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQWidget *widget ) const { switch ( m ) { @@ -2905,7 +2941,7 @@ int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const return 0; case PM_DefaultFrameWidth: { - /* + /* if (widget && ::tqt_cast<TQFrame*>(widget) && ((TQFrame*)widget)->frameShape() == TQFrame::LineEditPanel) return 6;*/ if (widget && widget->parentWidget() && ::tqt_cast<TQTabWidget*>(widget->parentWidget()) && widget->parentWidget()->parentWidget() && (widget->parentWidget()->parentWidget()->inherits("KonqMainWindow") || widget->parentWidget()->parentWidget()->inherits("KonqFrameContainer"))) //for the konqueror statusbar offset, thanks konqueror team... ... ... f***f***f***!!! @@ -2955,14 +2991,16 @@ int LiquidStyle::pixelMetric( PixelMetric m, const TQWidget *widget ) const case PM_ButtonShiftVertical: return 0; default: - return TDEStyle::pixelMetric( m, widget ); + return TDEStyle::pixelMetric( m, ceData, elementFlags, widget ); } } TQSize LiquidStyle::sizeFromContents( ContentsType contents, - const TQWidget *widget, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, const TQSize &contentSize, - const TQStyleOption& opt ) const { + const TQStyleOption& opt, + const TQWidget *widget ) const { switch ( contents ) { case CT_PushButton: { // this is a little funky - we give values not based on pixelMetric @@ -2974,7 +3012,7 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents, int h = contentSize.height() > 24 ? contentSize.height() : 25; if ( button->text().isEmpty() ) - return ( TQSize( contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, widget ), h ) ); + return ( TQSize( contentSize.width() + 2 * pixelMetric( PM_ButtonMargin, ceData, elementFlags, widget ), h ) ); return ( TQSize( w, h ) ); } @@ -3000,7 +3038,7 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents, } case CT_ComboBox: { - // TQSize sz = TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); + // TQSize sz = TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); // return ( TQSize( sz.width()+3, sz.height() > 25 ? sz.height() : 25 ) ); if ( ::tqt_cast<const TQComboBox *>(widget) && ((const TQComboBox *)widget)->editable()) return ( TQSize( contentSize.width()+27, contentSize.height() + 4 > 22 ? contentSize.height() + 4 : 26 ) ); @@ -3054,19 +3092,26 @@ TQSize LiquidStyle::sizeFromContents( ContentsType contents, default: break; } - return TDEStyle::sizeFromContents( contents, widget, contentSize, opt ); + return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); } TQPixmap LiquidStyle::stylePixmap( StylePixmap stylepixmap, - const TQWidget* widget, - const TQStyleOption& opt ) const { - return TDEStyle::stylePixmap( stylepixmap, widget, opt ); + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + const TQStyleOption& opt, + const TQWidget* widget ) const { + return TDEStyle::stylePixmap( stylepixmap, ceData, elementFlags, opt, widget ); } #include "eventfilter.cpp" -TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, const TQWidget *widget, SubControl subcontrol, const TQStyleOption &opt ) const +TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, + const TQStyleControlElementData &ceData, + ControlElementFlags elementFlags, + SubControl subcontrol, + const TQStyleOption &opt, + const TQWidget *widget ) const { if ( control == CC_ComboBox && subcontrol == SC_ComboBoxEditField ) return TQRect( 8, 3, widget->width() - 32, widget->height() - 7 ); @@ -3091,11 +3136,11 @@ TQRect LiquidStyle::querySubControlMetrics( ComplexControl control, const TQWidg case SC_TitleBarUnshadeButton: return TQRect( widget->width() - 29, 1, 24, 16 ); default: - return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); + return ( TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget ) ); } } else - return ( TDEStyle::querySubControlMetrics( control, widget, subcontrol, opt ) ); + return ( TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget ) ); } TQImage LiquidStyle::fetchImage( const char *name ){ @@ -3347,7 +3392,7 @@ TQPixmap* LiquidStyle::getPixmap( BitmapData item ) const case progress2: ptr->pixmaps[ progress2 ] = processEmbedded( "progress2", btnColor ); break; - + case TitleBar: { if (optionHandler->style() == Jaguar) |