|
|
|
@ -575,12 +575,13 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
|
|
|
|
|
{
|
|
|
|
|
int x, y, w, h;
|
|
|
|
|
r.rect( &x, &y, &w, &h );
|
|
|
|
|
int checkcol = styleHint(SH_MenuIndicatorColumnWidth, ceData, elementFlags, opt, NULL, NULL);
|
|
|
|
|
|
|
|
|
|
TQRect vrect = visualRect( TQRect( x, y, w, h ), r );
|
|
|
|
|
TQRect vrect = visualRect( TQRect( x, y, checkcol, h ), r );
|
|
|
|
|
int xvis = vrect.x();
|
|
|
|
|
|
|
|
|
|
if ( act && !dis ) {
|
|
|
|
|
qDrawShadePanel( p, xvis, y, w, h, cg, TRUE, 1, &cg.brush( TQColorGroup::Button ) );
|
|
|
|
|
qDrawShadePanel( p, xvis, y, checkcol, h, cg, TRUE, 1, &cg.brush( TQColorGroup::Button ) );
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
TQBrush fill( cg.light(), Dense4Pattern );
|
|
|
|
@ -589,7 +590,7 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
|
|
|
|
|
// a consistent look
|
|
|
|
|
TQPoint origin = p->brushOrigin();
|
|
|
|
|
p->setBrushOrigin( xvis, y );
|
|
|
|
|
qDrawShadePanel( p, xvis, y, w, h, cg, TRUE, 1, &fill );
|
|
|
|
|
qDrawShadePanel( p, xvis, y, checkcol, h, cg, TRUE, 1, &fill );
|
|
|
|
|
// restore the previous brush origin
|
|
|
|
|
p->setBrushOrigin( origin );
|
|
|
|
|
}
|
|
|
|
@ -600,8 +601,9 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
|
|
|
|
|
{
|
|
|
|
|
int x, y, w, h;
|
|
|
|
|
r.rect( &x, &y, &w, &h );
|
|
|
|
|
int checkcol = styleHint(SH_MenuIndicatorColumnWidth, ceData, elementFlags, opt, NULL, NULL);
|
|
|
|
|
|
|
|
|
|
TQRect vrect = visualRect( TQRect( x, y, w, h ), r );
|
|
|
|
|
TQRect vrect = visualRect( TQRect( x, y, checkcol, h ), r );
|
|
|
|
|
int xvis = vrect.x();
|
|
|
|
|
|
|
|
|
|
qDrawShadePanel( p, xvis, y, w, h, cg, FALSE, 1, &cg.brush( TQColorGroup::Button ) );
|
|
|
|
@ -612,6 +614,7 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
|
|
|
|
|
{
|
|
|
|
|
int x, y, w, h;
|
|
|
|
|
r.rect( &x, &y, &w, &h );
|
|
|
|
|
int checkcol = styleHint(SH_MenuIndicatorColumnWidth, ceData, elementFlags, opt, NULL, NULL);
|
|
|
|
|
|
|
|
|
|
int xp = x + windowsItemFrame;
|
|
|
|
|
|
|
|
|
@ -621,7 +624,7 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
|
|
|
|
|
if (act)
|
|
|
|
|
cflags |= Style_On;
|
|
|
|
|
|
|
|
|
|
drawPrimitive(PE_CheckMark, p, ceData, elementFlags, visualRect( TQRect(xp, y + windowsItemFrame, w - 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);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
@ -866,7 +869,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
|
|
|
|
|
TQRect vrect = visualRect( TQRect( xpos, y, checkcol, h ), r );
|
|
|
|
|
int xvis = vrect.x();
|
|
|
|
|
if ( mi->isChecked() ) {
|
|
|
|
|
drawPrimitive(PE_MenuItemIndicatorFrame, p, ceData, elementFlags, TQRect(x, y, checkcol, h), cg, flags);
|
|
|
|
|
drawPrimitive(PE_MenuItemIndicatorFrame, p, ceData, elementFlags, r, cg, flags, opt);
|
|
|
|
|
} else if (! act)
|
|
|
|
|
p->fillRect(xvis, y, checkcol , h, cg.brush( TQColorGroup::Button ));
|
|
|
|
|
|
|
|
|
@ -882,7 +885,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
|
|
|
|
|
int pixw = pixmap.width();
|
|
|
|
|
int pixh = pixmap.height();
|
|
|
|
|
if ( act && !dis && !mi->isChecked() )
|
|
|
|
|
drawPrimitive(PE_MenuItemIndicatorIconFrame, p, ceData, elementFlags, TQRect(x, y, checkcol, h), cg, flags);
|
|
|
|
|
drawPrimitive(PE_MenuItemIndicatorIconFrame, p, ceData, elementFlags, r, cg, flags, opt);
|
|
|
|
|
TQRect pmr( 0, 0, pixw, pixh );
|
|
|
|
|
pmr.moveCenter( vrect.center() );
|
|
|
|
|
p->setPen( cg.text() );
|
|
|
|
@ -895,7 +898,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
|
|
|
|
|
p->fillRect( visualRect( TQRect( xp, y, w - checkcol - 1, h ), r ), fill);
|
|
|
|
|
} else if ( checkable ) { // just "checking"...
|
|
|
|
|
if ( mi->isChecked() ) {
|
|
|
|
|
drawPrimitive(PE_MenuItemIndicatorCheck, p, ceData, elementFlags, TQRect(x, y, checkcol, h), cg, flags);
|
|
|
|
|
drawPrimitive(PE_MenuItemIndicatorCheck, p, ceData, elementFlags, r, cg, flags, opt);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1073,6 +1076,13 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ce
|
|
|
|
|
ret = TQMAX( 6, TQApplication::globalStrut().width() );
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case PM_MenuIndicatorFrameHBorder:
|
|
|
|
|
case PM_MenuIndicatorFrameVBorder:
|
|
|
|
|
case PM_MenuIconIndicatorFrameHBorder:
|
|
|
|
|
case PM_MenuIconIndicatorFrameVBorder:
|
|
|
|
|
ret = windowsItemFrame;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
ret = TQCommonStyle::pixelMetric(metric, ceData, elementFlags, widget);
|
|
|
|
|
break;
|
|
|
|
@ -1996,6 +2006,23 @@ int TQWindowsStyle::styleHint( StyleHint hint,
|
|
|
|
|
ret = 0;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SH_MenuIndicatorColumnWidth:
|
|
|
|
|
{
|
|
|
|
|
int maxpmw = opt.maxIconWidth();
|
|
|
|
|
bool checkable = ( elementFlags & CEF_IsCheckable );
|
|
|
|
|
|
|
|
|
|
if ( checkable ) {
|
|
|
|
|
// space for the checkmarks
|
|
|
|
|
if (use2000style)
|
|
|
|
|
maxpmw = TQMAX( maxpmw, 20 );
|
|
|
|
|
else
|
|
|
|
|
maxpmw = TQMAX( maxpmw, 12 );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = maxpmw;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
ret = TQCommonStyle::styleHint(hint, ceData, elementFlags, opt, returnData, widget);
|
|
|
|
|
break;
|
|
|
|
|