Use only two (instead of three) button controls on scrollbars due to space

constraints) -- will be configureable somtime ...

1 files changed, 9 insertions, 9 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index acf0a42..67e53e9 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1517,13 +1517,13 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
         subX = addX = ( extent - buttonDim ) / 2;
         subY = 0;
         addY = len - buttonDim;
         if(sbBuffer.size() != sb->size())
             sbBuffer.resize(sb->size());
     }
-    subB.setRect( subX,subY,buttonDim,buttonDim );
+    subB.setRect( subX,subY,0,0); // buttonDim,buttonDim );
     addB.setRect( addX,addY,buttonDim,buttonDim );
     if(horiz)
         subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
     else
         subHC.setRect(addX,addY-buttonDim,buttonDim,buttonDim );
 
@@ -1545,13 +1545,13 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
 
     bool maxed = sb->maxValue() == sb->minValue();
 
     QPainter painter;
     if(!horiz){
         painter.begin(&sbBuffer);
-        QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*3))+1);
+        QRect bgR(0, subB.bottom()+1, sb->width(), (len-(buttonDim*2))+1);
         if(sliderR.height() >= 8){
             painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
                           13, 8);
             painter.drawPixmap(bgR.x()+1, bgR.y(), *getPixmap(VSBSliderTopBg));
             painter.drawTiledPixmap(bgR.x()+1, bgR.y()+8, 13,
                                     bgR.height()-16, *getPixmap(VSBSliderMidBg));
@@ -1611,13 +1611,13 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
                              bgR.bottom());
         }
         painter.end();
     }
     else{
         painter.begin(&sbBuffer);
-        QRect bgR(subB.right()+1, 0, (len-(buttonDim*3))+1, sb->height());
+        QRect bgR(subB.right()+1, 0, (len-(buttonDim*2))+1, sb->height());
         if(sliderR.width() >= 8){
             painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0,
                                8, 13);
             painter.drawPixmap(bgR.x(), bgR.y()+1, *getPixmap(HSBSliderTopBg));
             painter.drawTiledPixmap(bgR.x()+8, bgR.y()+1, bgR.width()-16,
                                     13, *getPixmap(HSBSliderMidBg));
@@ -1682,16 +1682,16 @@ void LiquidStyle::drawScrollBarControls(QPainter *p, const QScrollBar *sb,
         drawSBButton(p, addB, g, activeControl == AddLine);
         drawArrow( p, horiz ? RightArrow : DownArrow,
                    false, addB.x()+4, addB.y()+4,
                    addB.width()-8, addB.height()-8, g, !maxed);
     }
     if ( controls & SubLine ) {
-        drawSBButton(p, subB, g, activeControl == SubLine);
-        drawArrow( p, horiz ? LeftArrow : UpArrow,
-                   false, subB.x()+4, subB.y()+4,
-                   subB.width()-8, subB.height()-8, g, !maxed);
+     //   drawSBButton(p, subB, g, activeControl == SubLine);
+     //   drawArrow( p, horiz ? LeftArrow : UpArrow,
+     //              false, subB.x()+4, subB.y()+4,
+     //              subB.width()-8, subB.height()-8, g, !maxed);
         drawSBButton(p, subHC, g, activeControl == SubLine);
         drawArrow( p, horiz ? LeftArrow : UpArrow,
                    false, subHC.x()+4, subHC.y()+4,
                    subHC.width()-8, subHC.height()-8, g, !maxed);
     }
 
@@ -1786,14 +1786,14 @@ void LiquidStyle::scrollBarMetrics(const QScrollBar *sb, int &sliderMin,
 
     if ( length > ( extent - b*2 - 1 )*2 + b*2  )
         buttonDim = extent - b*2;
     else
         buttonDim = ( length - b*2 )/2 - 1;
 
-    sliderMin = b + buttonDim;
-    maxLength  = length - b*2 - buttonDim*3;
+    sliderMin = b + 0; // buttonDim;
+    maxLength  = length - b*2 - buttonDim*2; // 3;
 
     if ( sb->maxValue() == sb->minValue() ) {
         sliderLength = maxLength;
     } else {
         sliderLength = (sb->pageStep()*maxLength)/
                         (sb->maxValue()-sb->minValue()+sb->pageStep());