diff options
Diffstat (limited to 'tdestyles/highcolor/highcolor.cpp')
| -rw-r--r-- | tdestyles/highcolor/highcolor.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index 4fccff059..353fee30d 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -1347,7 +1347,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element, r.rect( &x, &y, &w, &h ); if ( checkable ) - checkcol = QMAX( checkcol, 20 ); + checkcol = TQMAX( checkcol, 20 ); // Are we a menu item separator? if ( mi->isSeparator() ) { @@ -1872,7 +1872,7 @@ int HighColorStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceD bool checkable = (elementFlags & CEF_IsCheckable); if ( checkable ) - checkcol = QMAX( checkcol, 20 ); + checkcol = TQMAX( checkcol, 20 ); ret = checkcol; } @@ -1950,17 +1950,17 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, } else { if ( mi->pixmap() ) - h = QMAX( h, mi->pixmap()->height() + 2*itemFrame ); + h = TQMAX( h, mi->pixmap()->height() + 2*itemFrame ); else { // Ensure that the minimum height for text-only menu items // is the same as the icon size used by KDE. - h = QMAX( h, 16 + 2*itemFrame ); - h = QMAX( h, popup->fontMetrics().height() + h = TQMAX( h, 16 + 2*itemFrame ); + h = TQMAX( h, popup->fontMetrics().height() + 2*itemVMargin + 2*itemFrame ); } if ( mi->iconSet() ) - h = QMAX( h, mi->iconSet()->pixmap( + h = TQMAX( h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal).height() + 2 * itemFrame ); } |