Use the bitmap found on the scrollbar as combobox

indicator.
A push effect is missing for that though

1 files changed, 3 insertions, 4 deletions

diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp
index fb6411c..139505f 100644
--- a/noncore/styles/phase/phasestyle.cpp
+++ b/noncore/styles/phase/phasestyle.cpp
@@ -691,101 +691,100 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable,
                            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 );
     }
 }
 
 
 QRect PhaseStyle::comboButtonRect ( int x, int y, int w, int h ) {
     return QRect(x+2, y+2, w-4-17, h-5 );
 }
 
 void PhaseStyle::drawComboButton( QPainter * p, int x, int y,
                                   int w, int h,
                                   const QColorGroup & g,
                                   bool sunken,
                                   bool editable,
                                   bool,
                                   const QBrush *) {
     drawButton(p, x, y, w, h, g,
                sunken, &g.brush(QColorGroup::Button ));
 
+    for ( int n = 0; n < 2; ++n )
+        kColorBitmaps(p, g, w-16+(6*n), y+(h/2)-2,
+                      0, &doodad_mid, &doodad_light, 0, 0, 0 );
 
-    bool odd = (h % 2);
-    drawPanel(p, w-15 , y+(h/2)-3,  10, (odd ? 7 : 6 ),
-              g, true , 1, sunken ? &g.brush(QColorGroup::Midlight)
-              : &g.brush(QColorGroup::Mid) );
 
     if (editable ) {
         const int x2 = x+w-1; const int y2 = y+h-1;
         p->setPen(g.dark());
         p->drawLine(x2+1, y, x2+1, y2);
         p->setPen(g.midlight());
         p->drawLine(x2+2, y, x2+2, y2-1);
         p->setPen(g.button());
         p->drawPoint(x2+2, y2);
     }
 
     p->setPen(g.buttonText() );
 }
 
 
 void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab,
                          bool selected ) {
     bool edge = false;
     int x, y, w, h;
     QRect r = tab->rect();
     r.rect(&x,&y,&w,&h);
     const int x2 = x+w-1;
     const int y2 = y+h-1;
     const QColorGroup &group = bar->colorGroup();
 
 
     painter->save();
 
     // what position is the tab?
     if ((bar->count() == 1 ))
 	edge = true;
     else
 	edge = false;
 
     switch (QTabBar::Shape(bar->shape())) {
     case QTabBar::RoundedAbove:
     case QTabBar::TriangularAbove: {
         if (!selected) { // shorten
             y += 2; h -= 2;
         }
         if (selected) {
             painter->setPen(Qt::NoPen);
             painter->fillRect(x+1, y+1, w-1, h-1,
                               group.brush(QColorGroup::Background));
         } else
             drawPhaseGradient(painter, QRect(x+1, y+1, w-1, h-2),
                               group.background().dark(contrast) );