diff options
Diffstat (limited to 'kstyles/light')
| -rw-r--r-- | kstyles/light/lightstyle-v2.cpp | 17 | ||||
| -rw-r--r-- | kstyles/light/lightstyle-v3.cpp | 17 |
2 files changed, 28 insertions, 6 deletions
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index a77a5fe03..e39c7c9b1 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -559,6 +559,18 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, p->fillRect(r.x(), r.y() + 2, r.width(), r.height() - 4, cg.highlight()); break; + case PE_MenuItemIndicatorFrame: + case PE_MenuItemIndicatorIconFrame: + { + qDrawShadePanel(p, r, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + } + break; + case PE_MenuItemIndicatorCheck: + { + drawPrimitive(PE_CheckMark, p, ceData, elementFlags, r, cg, (flags & Style_Enabled) | Style_On); + } + break; + default: if (pe == PE_HeaderArrow) { if (flags & Style_Down) @@ -837,7 +849,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, if (mi->isChecked() && ! (flags & Style_Active) & (flags & Style_Enabled)) - qDrawShadePanel(p, cr, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + drawPrimitive(PE_MenuItemIndicatorFrame, p, ceData, elementFlags, cr, cg, flags); if (mi->iconSet()) { TQIconSet::Mode mode = @@ -856,8 +868,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, p->setPen(cg.text()); p->drawPixmap(pmr.topLeft(), pixmap); } else if ((elementFlags & CEF_IsCheckable) && mi->isChecked()) - drawPrimitive(PE_CheckMark, p, ceData, elementFlags, cr, cg, - (flags & Style_Enabled) | Style_On); + drawPrimitive(PE_MenuItemIndicatorCheck, p, ceData, elementFlags, cr, cg, flags); TQColor textcolor; TQColor embosscolor; diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index 565b8ac2c..b76c7bda3 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -748,6 +748,18 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, p->fillRect(r.x(), r.y() + 2, r.width(), r.height() - 4, cg.highlight()); break; + case PE_MenuItemIndicatorFrame: + case PE_MenuItemIndicatorIconFrame: + { + qDrawShadePanel(p, r, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + } + break; + case PE_MenuItemIndicatorCheck: + { + drawPrimitive(PE_CheckMark, p, ceData, elementFlags, r, cg, (flags & Style_Enabled) | Style_On); + } + break; + default: if (pe == PE_HeaderArrow) { if (flags & Style_Down) @@ -957,7 +969,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, if (mi->isChecked() && ! (flags & Style_Active) & (flags & Style_Enabled)) - qDrawShadePanel(p, cr, cg, true, 1, &cg.brush(TQColorGroup::Midlight)); + drawPrimitive(PE_MenuItemIndicatorFrame, p, ceData, elementFlags, cr, cg, flags); if (mi->iconSet()) { TQIconSet::Mode mode = @@ -976,8 +988,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, p->setPen(cg.text()); p->drawPixmap(pmr.topLeft(), pixmap); } else if ((elementFlags & CEF_IsCheckable) && mi->isChecked()) - drawPrimitive(PE_CheckMark, p, ceData, elementFlags, cr, cg, - (flags & Style_Enabled) | Style_On); + drawPrimitive(PE_MenuItemIndicatorCheck, p, ceData, elementFlags, cr, cg, flags); TQColor textcolor; TQColor embosscolor; |