summaryrefslogtreecommitdiff
path: root/noncore/styles/theme/othemestyle.cpp
Unidiff
Diffstat (limited to 'noncore/styles/theme/othemestyle.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/theme/othemestyle.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/noncore/styles/theme/othemestyle.cpp b/noncore/styles/theme/othemestyle.cpp
index d97b026..8c7a71b 100644
--- a/noncore/styles/theme/othemestyle.cpp
+++ b/noncore/styles/theme/othemestyle.cpp
@@ -1201,33 +1201,34 @@ void OThemeStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
1201 p->setPen( g.light() ); 1201 p->setPen( g.light() );
1202 p->drawLine( x, y + 1, x + w, y + 1 ); 1202 p->drawLine( x, y + 1, x + w, y + 1 );
1203 return ; 1203 return ;
1204 } 1204 }
1205 if ( act ) { 1205 if ( act ) {
1206 drawBaseButton( p, x, y, w, h, g, true, false, MenuItemDown ); 1206 drawBaseButton( p, x, y, w, h, g, true, false, MenuItemDown );
1207 } 1207 }
1208 else { 1208 else {
1209 drawShade( p, x, y, w, h, *colorGroup( g, MenuItem ), false, false, 1209 drawShade( p, x, y, w, h, *colorGroup( g, MenuItem ), false, false,
1210 highlightWidth( MenuItem ), borderWidth( MenuItem ), 1210 highlightWidth( MenuItem ), borderWidth( MenuItem ),
1211 shade() ); 1211 shade() );
1212 int dw = decoWidth( MenuItem ); 1212 int dw = decoWidth( MenuItem );
1213 if ( !isPixmap( MenuItem ) ) 1213 if ( !isPixmap( MenuItem ) ) {
1214 p->fillRect( x + dw, y + dw, w - dw * 2, h - dw * 2, 1214 p->fillRect( x + dw, y + dw, w - dw * 2, h - dw * 2,
1215 colorGroup( g, MenuItem ) -> 1215 colorGroup( g, MenuItem ) ->
1216 brush( QColorGroup::Background ) ); 1216 brush( QColorGroup::Background ) );
1217 }
1217 else { 1218 else {
1218 // process inactive item pixmaps as one large item 1219 // process inactive item pixmaps as one large item
1219 p->drawTiledPixmap( x + dw, y + dw, w - dw * 2, h - dw * 2, *scalePixmap 1220 p->drawTiledPixmap( x + dw, y + dw, w - dw * 2, h - dw * 2, *scalePixmap
1220 // (w, p->window().height(), MenuItem), 1221 (w, ((QWidget *)p->device())->height(), MenuItem),
1221 ( w, p->clipRegion().boundingRect().height(), MenuItem ), 1222 //( w, p->clipRegion().boundingRect().height(), MenuItem ), // cliping does not work in Qt/E
1222 x, y ); 1223 x, y );
1223 } 1224 }
1224 1225
1225 if ( checkable && mi && mi->isChecked() ) { 1226 if ( checkable && mi && mi->isChecked() ) {
1226 // draw 'pressed' border around checkable items 1227 // draw 'pressed' border around checkable items
1227 // This is extremely important for items that have an iconset 1228 // This is extremely important for items that have an iconset
1228 // because the checkmark isn't drawn in that case 1229 // because the checkmark isn't drawn in that case
1229 // An alternative would be superimposing the checkmark over 1230 // An alternative would be superimposing the checkmark over
1230 // the iconset instead or not drawing the iconset at all. 1231 // the iconset instead or not drawing the iconset at all.
1231 int mw = checkcol + motifItemFrame; 1232 int mw = checkcol + motifItemFrame;
1232 drawShade( p, x, y, mw, h, g, true, false, 1233 drawShade( p, x, y, mw, h, g, true, false,
1233 highlightWidth( MenuItemDown ), 1234 highlightWidth( MenuItemDown ),