More icon sizing updates

7 files changed, 165 insertions, 21 deletions

diff --git a/noncore/styles/flat/flat.cpp b/noncore/styles/flat/flat.cpp
index f3bacf9..c164ecc 100644
--- a/noncore/styles/flat/flat.cpp
+++ b/noncore/styles/flat/flat.cpp
@@ -373,7 +373,7 @@ void FlatStyle::drawPushButtonLabel( QPushButton *btn, QPainter *p )
 	    ? QIconSet::Normal : QIconSet::Disabled;
 	if ( mode == QIconSet::Normal && btn->hasFocus() )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
+	QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Automatic, mode );
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	p->drawPixmap( x+2, y+h/2-pixh/2, pixmap );
@@ -902,7 +902,7 @@ int FlatStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFo
 	h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame - 1;
 
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
-	h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+	h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
     }
     if ( mi->custom() )
 	h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
@@ -954,7 +954,11 @@ void FlatStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 	QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
 	if (act && !dis )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = mi->iconSet()->pixmap();
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	if ( act && !dis ) {
diff --git a/noncore/styles/fresh/fresh.cpp b/noncore/styles/fresh/fresh.cpp
index 831b620..856f68b 100644
--- a/noncore/styles/fresh/fresh.cpp
+++ b/noncore/styles/fresh/fresh.cpp
@@ -648,7 +648,7 @@ int FreshStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QF
 	h = fm.height() + 2*motifItemVMargin + 2*motifItemFrame - 1;
 
     if ( !mi->isSeparator() && mi->iconSet() != 0 ) {
-	h = QMAX( h, mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height() + 2*motifItemFrame );
+	h = QMAX( h, mi->iconSet()->pixmap().height() + 2*motifItemFrame );
     }
     if ( mi->custom() )
 	h = QMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
@@ -702,7 +702,11 @@ void FreshStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int
 	QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
 	if (act && !dis )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = mi->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = mi->iconSet()->pixmap();
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 	if ( act && !dis ) {
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index 51814e7..77cf198 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1303,7 +1303,11 @@ void LiquidStyle::drawPushButtonLabel(QPushButton *btn, QPainter *p)
 			      ? QIconSet::Normal : QIconSet::Disabled;
 	if ( mode == QIconSet::Normal && btn->hasFocus() )
 	    mode = QIconSet::Active;
-	QPixmap pixmap = btn->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = btn->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = btn->iconSet()->pixmap();
 	int pixw = pixmap.width();
 	int pixh = pixmap.height();
 
@@ -2155,7 +2159,11 @@ static const int windowsRightBorder     = 12;
         QIconSet::Mode mode = dis? QIconSet::Disabled : QIconSet::Normal;
         if (!dis)
             mode = QIconSet::Active;
-        QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode);
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
         int pixw = pixmap.width();
         int pixh = pixmap.height();
         QRect cr(x, y, checkcol, h);
@@ -2236,8 +2244,7 @@ int LiquidStyle::popupMenuItemHeight(bool /*checkable*/, QMenuItem *mi,
         h = mi->pixmap()->height();
 
     if (mi->iconSet())
-        h = QMAX(mi->iconSet()->
-                 pixmap(QIconSet::Small, QIconSet::Normal).height(), h);
+        h = QMAX(mi->iconSet()->pixmap().height(), h);
 
     h = QMAX(fm.height() + 4, h);
 
diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp
index 746354e..c2b9de8 100644
--- a/noncore/styles/phase/phasestyle.cpp
+++ b/noncore/styles/phase/phasestyle.cpp
@@ -390,7 +390,10 @@ void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) {
         }
 #endif
 
-        pixmap = button->iconSet()->pixmap(QIconSet::Small, mode);
+        if ( mode == QIconSet::Disabled )
+            pixmap = button->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = button->iconSet()->pixmap();
         if (button->text().isEmpty() && !button->pixmap()) {
             painter->drawPixmap(x+w/2 - pixmap.width()/2,
                                 y+h/2 - pixmap.height()/2, pixmap);
@@ -569,8 +572,7 @@ int PhaseStyle::popupMenuItemHeight ( bool ,
                      + ITEMVMARGIN*2 + ITEMFRAME*2 );
         }
         if ( mi->iconSet() )
-            h = QMAX(h, mi->iconSet()->
-                     pixmap(QIconSet::Small, QIconSet::Normal ).height()
+            h = QMAX(h, mi->iconSet()->pixmap().height()
                      + ITEMFRAME*2 );
     }
 
@@ -661,7 +663,11 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable,
             mode = enabled ? QIconSet::Active : QIconSet::Disabled;
         else
             mode = enabled ? QIconSet::Normal : QIconSet::Disabled;
-        QPixmap pixmap = mi->iconSet()->pixmap(QIconSet::Small, mode );
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
         QRect pmrect(0, 0, pixmap.width(), pixmap.height() );
         QRect cr(x, y, maxpmw, h );
         pmrect.moveCenter( cr.center() );
diff --git a/noncore/styles/theme/othemestyle.cpp b/noncore/styles/theme/othemestyle.cpp
index 98e7253..106d206 100644
--- a/noncore/styles/theme/othemestyle.cpp
+++ b/noncore/styles/theme/othemestyle.cpp
@@ -1183,7 +1183,7 @@ void OThemeStyle::drawPushButtonLabel( QPushButton *btn, QPainter *p )
 		                      ? QIconSet::Normal : QIconSet::Disabled;
 		if ( mode == QIconSet::Normal && btn->hasFocus() )
 			mode = QIconSet::Active;
-		QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Small, mode );
+		QPixmap pixmap = btn->iconSet() ->pixmap( QIconSet::Automatic, mode );
 		int pixw = pixmap.width();
 		int pixh = pixmap.height();
 
@@ -1246,8 +1246,7 @@ int OThemeStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem *mi,
 		h = h2 > h ? h2 : h;
 	}
 	if ( mi->iconSet() ) {
-		h2 = mi->iconSet() ->
-		     pixmap( QIconSet::Small, QIconSet::Normal ).height() + offset;
+		h2 = mi->iconSet() ->pixmap().height() + offset;
 		h = h2 > h ? h2 : h;
 	}
 	h2 = fm.height() + offset;
@@ -1325,7 +1324,11 @@ void OThemeStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw,
 		QIconSet::Mode mode = dis ? QIconSet::Disabled : QIconSet::Normal;
 		if ( act && !dis )
 			mode = QIconSet::Active;
-		QPixmap pixmap = mi->iconSet() ->pixmap( QIconSet::Small, mode );
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
 		int pixw = pixmap.width();
 		int pixh = pixmap.height();
 		QRect cr( x, y, checkcol, h );
diff --git a/noncore/styles/web/webstyle.cpp b/noncore/styles/web/webstyle.cpp
index cd3cf08..7b58d89 100644
--- a/noncore/styles/web/webstyle.cpp
+++ b/noncore/styles/web/webstyle.cpp
@@ -43,6 +43,15 @@ static int        _savedFrameLineWidth;
 static int        _savedFrameMidLineWidth;
 static ulong      _savedFrameStyle;
 
+static const int ITEMFRAME       = 1; // menu stuff
+static const int ITEMHMARGIN     = 3;
+static const int ITEMVMARGIN     = 0;
+
+static const int ARROWMARGIN     = 6;
+static const int RIGHTBORDER     = 10;
+static const int MINICONSIZE     = 12;
+
+
 static QColor contrastingForeground(const QColor & fg, const QColor & bg)
 {
   int h, s, vbg, vfg;
@@ -969,7 +978,7 @@ WebStyle::drawPopupMenuItem
  QPainter * p,
  bool checkable,
  int maxpmw,
- int tab,
+ int tabwidth,
  QMenuItem * mi,
  const QPalette & pal,
  bool act,
@@ -981,7 +990,118 @@ WebStyle::drawPopupMenuItem
 )
 {
   // TODO
-  QWindowsStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
+  //QWindowsStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h);
+    if ( !mi )
+        return;
+
+    QRect rect(x, y, w, h );
+    int x2, y2;
+    x2 = rect.right();
+    y2 = rect.bottom();
+    const QColorGroup& g = pal.active();
+    QColorGroup itemg    = !enabled ? pal.disabled() : pal.active();
+
+    if ( checkable || maxpmw ) maxpmw = QMAX(maxpmw, 20);
+
+    if (act && enabled )
+        p->fillRect(x, y, w, h, g.highlight() );
+    else
+        p->fillRect(x, y, w, h, g.background() );
+
+    // draw seperator
+    if (mi->isSeparator() ) {
+    p->setPen( g.dark() );
+    p->drawLine( x+8, y+1, x+w-8, y+1 );
+
+        p->setPen( g.mid() );
+        p->drawLine( x+8,   y, x+w-8, y );
+        p->drawPoint(x+w,y+1);
+
+    p->setPen( g.midlight() );
+    p->drawLine( x+8, y-1, x+w-8, y-1 );
+        p->drawPoint(x+8, y );
+        return;
+    }
+
+    // draw icon
+    QIconSet::Mode mode;
+    if ( mi->iconSet() && !mi->isChecked() ) {
+        if ( act )
+            mode = enabled ? QIconSet::Active : QIconSet::Disabled;
+        else
+            mode = enabled ? QIconSet::Normal : QIconSet::Disabled;
+        QPixmap pixmap;
+        if ( mode == QIconSet::Disabled )
+            pixmap = mi->iconSet()->pixmap( QIconSet::Automatic, mode );
+        else
+            pixmap = mi->iconSet()->pixmap();
+        QRect pmrect(0, 0, pixmap.width(), pixmap.height() );
+        QRect cr(x, y, maxpmw, h );
+        pmrect.moveCenter( cr.center() );
+        p->drawPixmap(pmrect.topLeft(), pixmap);
+    }
+
+    // draw check
+    if(mi->isChecked() ) {
+        drawCheckMark(p, x, y, maxpmw, h, itemg, act, !enabled );
+    }
+
+
+    // draw text
+    int xm = maxpmw + 2;
+    int xp = x + xm;
+    int tw = w -xm - 2;
+
+    p->setPen( enabled ? ( act ? g.highlightedText() : g.buttonText() ) :
+                         g.mid() );
+
+
+    if ( mi->custom() ) {
+        p->save();
+        mi->custom()->paint(p, g, act, enabled,
+                              xp, y+1, tw, h-2 );
+        p->restore();
+    }else { // draw label
+        QString text = mi->text();
+        if (!text.isNull() ) {
+            int t = text.find('\t');
+            const int tflags = AlignVCenter | DontClip |
+                               ShowPrefix |  SingleLine |
+                               AlignLeft;
+
+            if (t >= 0) {
+                int tabx = x + w - tabwidth - RIGHTBORDER -
+                           ITEMHMARGIN - ITEMFRAME;
+                p->drawText(tabx, y+ITEMVMARGIN, tabwidth,
+                            h-2*ITEMVMARGIN, tflags,
+                            text.mid(t+1) );
+                text = text.left(t );
+            }
+
+            // draw left label
+             p->drawText(xp, y+ITEMVMARGIN,
+                         tw, h-2*ITEMVMARGIN,
+                         tflags, text, t);
+        }else if ( mi->pixmap() ) { // pixmap as label
+            QPixmap pixmap = *mi->pixmap();
+            if ( pixmap.depth() == 1 )
+                p->setBackgroundMode( OpaqueMode );
+
+            int dx = ((w-pixmap.width() )  /2 ) +
+                 ((w - pixmap.width()) %2 );
+            p->drawPixmap(x+dx, y+ITEMFRAME, pixmap );
+
+            if ( pixmap.depth() == 1 )
+                p->setBackgroundMode( TransparentMode );
+        }
+    }
+
+    if ( mi->popup() ) { // draw submenu arrow
+        int dim = (h-2*ITEMFRAME) / 2;
+        drawArrow( p, RightArrow, false,
+                   x+w-ARROWMARGIN-ITEMFRAME-dim,
+                   y+h/2-dim/2, dim, dim, g, enabled );
+    }
 }
 
   void
@@ -1168,7 +1288,7 @@ WebStyle::popupMenuItemHeight(bool, QMenuItem * i, const QFontMetrics & fm)
   {
     h = QMAX
       (
-       i->iconSet()->pixmap(QIconSet::Small, QIconSet::Normal).height(),
+       i->iconSet()->pixmap().height(),
        h
       );
   }
diff --git a/noncore/styles/web/webstyle.h b/noncore/styles/web/webstyle.h
index 83ab784..d6f153b 100644
--- a/noncore/styles/web/webstyle.h
+++ b/noncore/styles/web/webstyle.h
@@ -215,7 +215,7 @@ class WebStyle : public QWindowsStyle {
        QPainter *,
        bool checkable,
        int maxpmw,
-       int tab,
+       int tabwidth,
        QMenuItem *,
        const QPalette &,
        bool act,