Not making at least qDebug outputs on every QToolButton redraw may speed

things up a bit ;)

2 files changed, 61 insertions, 83 deletions

diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp
index daac22c..e6d8310 100644
--- a/noncore/styles/liquid/liquid.cpp
+++ b/noncore/styles/liquid/liquid.cpp
@@ -1105,6 +1105,4 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
                 highlightWidget = btn;
                 btn->repaint(false);
-                
-                        qDebug ( "TB FOCUS IN [%p]", btn );
             }
         }
@@ -1113,6 +1111,4 @@ bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
                 highlightWidget = NULL;
                 btn->repaint(false);
-                
-                qDebug ( "TB FOCUS OUT [%p]", btn );
             }
         }
@@ -1248,9 +1244,6 @@ void LiquidStyle::drawToolButton(QPainter *p, int x, int y, int w, int h,
 
         p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
-        qDebug ( "DRAW TOOLBUTTON IN PIXMAP" );
     }
     else{
-            qDebug ( "DRAW TOOLBUTTON sunken=%d/high=%p/device=%p", sunken, highlightWidget,p->device() );
-    
         drawClearBevel(p, x, y, w, h, sunken ? g.button() :
                        highlightWidget == p->device() ? g.button().light(110) :
diff --git a/noncore/styles/liquid/opie-liquid.diff b/noncore/styles/liquid/opie-liquid.diff
index d90433c..9ae24cc 100644
--- a/noncore/styles/liquid/opie-liquid.diff
+++ b/noncore/styles/liquid/opie-liquid.diff
@@ -4,5 +4,5 @@ Features:
  - works with Qt/E on QPE/OPIE
  
-        --- -2002-11-21 20:45:47.000000000 +0100
+        --- -2002-11-29 12:30:34.000000000 +0100
         +++ liquid.h2002-11-18 03:32:40.000000000 +0100
 @@ -2,7 +2,7 @@
@@ -142,6 +142,6 @@ Features:
      TransMenuHandler *menuHandler;
      QPixmap *pixmaps[BITMAP_ITEMS];
-        --- -2002-11-21 20:45:47.000000000 +0100
-        +++ liquid.cpp2002-11-21 20:27:48.000000000 +0100
+        --- -2002-11-29 12:30:34.000000000 +0100
+        +++ liquid.cpp2002-11-29 12:30:24.000000000 +0100
 @@ -2,6 +2,9 @@
   * Copyright (C)QPL 2001 Daniel M. Duley. All rights reserved.
@@ -272,5 +272,5 @@ Features:
              }
              else{ // tear off menu
-@@ -121,82 +126,61 @@
+@@ -121,82 +126,62 @@
                  stripePixmap(*pix, p->colorGroup().button());
              }
@@ -342,9 +342,8 @@ Features:
 -                if(w->inherits("QMenuBar")){
 -                    w->repaint();
+-                }
+-            }
         +                       wid-> setBackgroundMode( QWidget::PaletteBackground );
                  }
-        +               delete ol;
-             }
-         }
 -    }
 -    else if(id == MOSFET_BUTTON_CHANGE){
@@ -366,6 +365,7 @@ Features:
 -            if(w->inherits("QPushButton")){
 -                ((LiquidStyle*)parent())->applyCustomAttributes((QPushButton *)w);
--            }
--        }
+        +               delete ol;
+             }
+         }
 +    return(false);
 +}
@@ -388,9 +388,10 @@ Features:
         +oldqte = ( qt_version ( ) < 234 );
         +flatTBButtons = false;
+        +currentHeader = 0;
 +
      btnMaskBmp = QBitmap(37, 26, buttonmask_bits, true);
      btnMaskBmp.setMask(btnMaskBmp);
      htmlBtnMaskBmp = QBitmap(37, 26, htmlbuttonmask_bits, true);
-@@ -207,12 +191,8 @@
+@@ -207,12 +192,8 @@
      btnDict.setAutoDelete(true);
      bevelFillDict.setAutoDelete(true);
@@ -405,5 +406,5 @@ Features:
      btnBorderPix->convertFromImage(qembed_findImage("buttonfill"));
      btnBlendPix = new QPixmap;
-@@ -572,131 +552,119 @@
+@@ -572,131 +553,119 @@
      case HTMLBtnBorderDown:
          pixmaps[HTMLBtnBorderDown] = processEmbedded("htmlbtnborder", btnHoverH, btnHoverS, btnHoverV);
@@ -495,8 +496,8 @@ Features:
 +    case CBDown:
 +        pixmaps[CBDown] = processEmbedded("checkboxdown", btnH, btnS, btnV /*, true*/);
-+        break;
+         break;
 +    case CBDownHover:
 +        pixmaps[CBDownHover] = processEmbedded("checkboxdown", btnHoverH, btnHoverS, btnHoverV /*, true*/);
-         break;
++        break;
 +
      case VSlider:
@@ -600,5 +601,5 @@ Features:
          break;
      case HSBSliderMidBg:
-@@ -711,7 +679,6 @@
+@@ -711,7 +680,6 @@
  
  void LiquidStyle::polish(QPalette &appPal)
@@ -608,5 +609,5 @@ Features:
      for(i=0; i < BITMAP_ITEMS; ++i){
          if(pixmaps[i]){
-@@ -719,31 +686,28 @@
+@@ -719,31 +687,28 @@
              pixmaps[i] = NULL;
          }
@@ -655,5 +656,5 @@ Features:
          QBrush btnBrush(QColor(200, 202, 228));
          appPal.setBrush(QColorGroup::Button, btnBrush);
-@@ -778,8 +742,8 @@
+@@ -778,8 +743,8 @@
          adjustHSV(*pix, h, s, v);
          smallBevelFillDict.insert(c.rgb(), pix);
@@ -666,5 +667,5 @@ Features:
      c = c.dark(120);
      pix = smallBevelFillDict.find(c.rgb()); // better be NULL ;-)
-@@ -790,19 +754,13 @@
+@@ -790,19 +755,13 @@
          adjustHSV(*pix, h, s, v);
          smallBevelFillDict.insert(c.rgb(), pix);
@@ -691,5 +692,5 @@ Features:
      c.light(120).hsv(&bHoverH, &bHoverS, &bHoverV);
  
-@@ -817,101 +775,50 @@
+@@ -817,101 +776,50 @@
      wallPaper.fill(c.rgb());
      painter.begin(&wallPaper);
@@ -814,5 +815,5 @@ Features:
  
      bool isViewport = qstrcmp(w->name(), "qt_viewport") == 0 ||
-@@ -942,11 +849,20 @@
+@@ -942,11 +850,20 @@
          w->setMouseTracking(true);
          w->installEventFilter(this);
@@ -837,5 +838,5 @@ Features:
      if(w->parent() && w->parent()->isWidgetType() && !((QWidget*)w->parent())->
         palette().active().brush(QColorGroup::Background).pixmap()){
-@@ -954,16 +870,21 @@
+@@ -954,16 +871,21 @@
          return;
      }
@@ -865,5 +866,5 @@ Features:
  }
  
-@@ -977,6 +898,11 @@
+@@ -977,6 +899,11 @@
  
      if(w->inherits("QPopupMenu"))
@@ -877,5 +878,5 @@ Features:
      if(w->isTopLevel())
          return;
-@@ -986,7 +912,7 @@
+@@ -986,7 +913,7 @@
          ((qstrcmp(w->parent()->name(), "qt_viewport") == 0) ||
           (qstrcmp(w->parent()->name(), "qt_clipped_viewport") == 0));
@@ -886,5 +887,5 @@ Features:
          if(w->inherits("QPushButton"))
              w->setBackgroundMode(QWidget::PaletteButton);
-@@ -997,16 +923,12 @@
+@@ -997,16 +924,12 @@
      if(isViewportChild)
          w->setAutoMask(false);
@@ -908,5 +909,5 @@ Features:
      }
      if(w->inherits("QButton") || w->inherits("QComboBox")){
-@@ -1014,9 +936,12 @@
+@@ -1014,9 +937,12 @@
              w->setAutoMask(false);
          }
@@ -923,5 +924,5 @@ Features:
      }
      if(w->inherits("QHeader")){
-@@ -1028,22 +953,118 @@
+@@ -1028,22 +954,118 @@
  void LiquidStyle::polish(QApplication *app)
  {
@@ -1044,5 +1045,5 @@ Features:
   * This is a fun method ;-) Here's an overview. KToolBar grabs resize to
   * force everything to erase and repaint on resize. This is going away, I'm
-@@ -1063,7 +1084,7 @@
+@@ -1063,7 +1085,7 @@
   */
  bool LiquidStyle::eventFilter(QObject *obj, QEvent *ev)
@@ -1053,5 +1054,5 @@ Features:
              const QObjectList *tbChildList = obj->children();
              QObjectListIt it(*tbChildList);
-@@ -1076,116 +1097,27 @@
+@@ -1076,116 +1098,23 @@
  
          }
@@ -1122,6 +1123,4 @@ Features:
                  highlightWidget = btn;
                  btn->repaint(false);
-+                
-        +               qDebug ( "TB FOCUS IN [%p]", btn );
              }
          }
@@ -1132,6 +1131,4 @@ Features:
                  highlightWidget = NULL;
                  btn->repaint(false);
-+                
-+                qDebug ( "TB FOCUS OUT [%p]", btn );
              }
          }
@@ -1181,5 +1178,5 @@ Features:
      }
      else if(obj->inherits("QRadioButton") || obj->inherits("QCheckBox")){
-@@ -1201,6 +1133,7 @@
+@@ -1201,6 +1130,7 @@
              QSize sz = isRadio ? exclusiveIndicatorSize()
                  : indicatorSize();
@@ -1189,5 +1186,5 @@ Features:
                  QRect r = QRect(0, 0, btn->width(), btn->height());
                  p.setPen(btn->colorGroup().button().dark(140));
-@@ -1209,6 +1142,7 @@
+@@ -1209,6 +1139,7 @@
                  p.drawLine(r.right(), r.y()+1, r.right(), r.bottom()-1);
                  p.drawLine(r.x()+1, r.bottom(), r.right()-1, r.bottom());
@@ -1197,5 +1194,5 @@ Features:
              int y = (btn->height()-lsz.height()+fm.height()-sz.height())/2;
              if(isRadio)
-@@ -1228,36 +1162,6 @@
+@@ -1228,36 +1159,6 @@
              p.end();
              return(true);
@@ -1234,5 +1231,5 @@ Features:
      else if(obj->inherits("QHeader")){
          QHeader *hw = (QHeader *)obj;
-@@ -1290,7 +1194,24 @@
+@@ -1290,7 +1191,24 @@
              }
          }
@@ -1260,17 +1257,5 @@ Features:
  
  void LiquidStyle::drawButton(QPainter *p, int x, int y, int w, int h,
-@@ -1325,8 +1246,11 @@
-         }
- 
-         p->drawTiledPixmap(x+2, y+2, w-4, h-4, *pix);
-+        qDebug ( "DRAW TOOLBUTTON IN PIXMAP" );
-     }
-     else{
-        +    qDebug ( "DRAW TOOLBUTTON sunken=%d/high=%p/device=%p", sunken, highlightWidget,p->device() );
-+    
-         drawClearBevel(p, x, y, w, h, sunken ? g.button() :
-                        highlightWidget == p->device() ? g.button().light(110) :
-                        g.background(), g.background());
-@@ -1340,11 +1264,6 @@
+@@ -1340,11 +1258,6 @@
      QColorGroup g = btn->colorGroup();
  
@@ -1284,5 +1269,5 @@ Features:
      if(btn->hasFocus() || btn->isDefault()){
          QColor c = btn->hasFocus() ? g.button().light(110) : g.background();
-@@ -1488,7 +1407,20 @@
+@@ -1488,7 +1401,20 @@
                                   const QColorGroup &g, bool sunken,
                                   bool edit, bool, const QBrush *)
@@ -1306,5 +1291,5 @@ Features:
      if(painter->device()->devType() == QInternal::Widget)
          isMasked = ((QWidget*)painter->device())->autoMask();
-@@ -1498,7 +1430,7 @@
+@@ -1498,7 +1424,7 @@
  
      drawRoundButton(&p, g.button(), g.background(), 0, 0, w, h, false,
@@ -1315,5 +1300,5 @@ Features:
          drawRoundButton(&p, g.background(), g.background(), 0, 0, w, h, false,
                          sunken, false, isMasked);
-@@ -1550,16 +1482,17 @@
+@@ -1550,16 +1476,17 @@
      return(QRect(x+9, y+3, w - (h / 3) - 20, h-6));
  }
@@ -1336,5 +1321,5 @@ Features:
      scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim );
  
-@@ -1596,7 +1529,7 @@
+@@ -1596,7 +1523,7 @@
          if(sbBuffer.size() != sb->size())
              sbBuffer.resize(sb->size());
@@ -1345,5 +1330,5 @@ Features:
      if(horiz)
          subHC.setRect(addX-buttonDim,addY,buttonDim,buttonDim );
-@@ -1624,7 +1557,7 @@
+@@ -1624,7 +1551,7 @@
      QPainter painter;
      if(!horiz){
@@ -1354,5 +1339,5 @@ Features:
              painter.drawPixmap(bgR.x()+1, bgR.y(), *vsbSliderFillPix, 0, 0,
                            13, 8);
-@@ -1648,25 +1581,15 @@
+@@ -1648,25 +1575,15 @@
          }
          if(controls & Slider){
@@ -1385,5 +1370,5 @@ Features:
              else{
                  painter.setPen(g.button().dark(210));
-@@ -1674,7 +1597,6 @@
+@@ -1674,7 +1591,6 @@
                                13, sliderR.height());
                  painter.drawTiledPixmap(sliderR.x()+2, sliderR.y()+1,
@@ -1393,5 +1378,5 @@ Features:
              }
          }
-@@ -1690,7 +1612,7 @@
+@@ -1690,7 +1606,7 @@
      }
      else{
@@ -1402,5 +1387,5 @@ Features:
              painter.drawPixmap(bgR.x(), bgR.y()+1, *vsbSliderFillPix, 0, 0,
                                 8, 13);
-@@ -1715,22 +1637,17 @@
+@@ -1715,22 +1631,17 @@
          if(controls & Slider){
              if(sliderR.width() >= 16){
@@ -1428,5 +1413,5 @@ Features:
              }
              else{
-@@ -1738,8 +1655,7 @@
+@@ -1738,8 +1649,7 @@
                  drawRoundRect(&painter, sliderR.x(), sliderR.y()+1,
                                sliderR.width(), 13);
@@ -1438,5 +1423,5 @@ Features:
              }
          }
-@@ -1761,10 +1677,10 @@
+@@ -1761,10 +1671,10 @@
                     addB.width()-8, addB.height()-8, g, !maxed);
      }
@@ -1453,5 +1438,5 @@ Features:
          drawArrow( p, horiz ? LeftArrow : UpArrow,
                     false, subHC.x()+4, subHC.y()+4,
-@@ -1865,8 +1781,8 @@
+@@ -1865,8 +1775,8 @@
      else
          buttonDim = ( length - b*2 )/2 - 1;
@@ -1464,5 +1449,5 @@ Features:
      if ( sb->maxValue() == sb->minValue() ) {
          sliderLength = maxLength;
-@@ -1914,31 +1830,31 @@
+@@ -1914,31 +1824,31 @@
      return(QSize(16, 16));
  }
@@ -1503,5 +1488,5 @@ Features:
      }
  }
-@@ -1957,25 +1873,25 @@
+@@ -1957,25 +1867,25 @@
      return(QSize(20, 22));
  }
@@ -1535,5 +1520,5 @@ Features:
              /*  Todo - tristate
               if(state == QButton::On){
-@@ -1992,12 +1908,12 @@
+@@ -1992,12 +1902,12 @@
               }*/
          }
@@ -1551,5 +1536,5 @@ Features:
      // needed for some reason by KHtml, even tho it's all filled ;P
      p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask());
-@@ -2005,18 +1921,17 @@
+@@ -2005,18 +1915,17 @@
  }
  
@@ -1573,5 +1558,5 @@ Features:
  {
      p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() :
-@@ -2065,243 +1980,76 @@
+@@ -2065,243 +1974,76 @@
      p->drawLineSegments(a);
  }
@@ -1634,7 +1619,7 @@ Features:
 -                        &g.brush(QColorGroup::Background));
 -    }
- 
--}
 -
+-}
+ 
 -void LiquidStyle::drawKToolBar(QPainter *p, int x, int y, int w, int h,
 -                           const QColorGroup &g, KToolBarPos, QBrush *)
@@ -1846,5 +1831,5 @@ Features:
      QColor c;
      switch(menuHandler->transType()){
-@@ -2336,8 +2084,6 @@
+@@ -2336,8 +2078,6 @@
  
      maxpmw = QMAX( maxpmw, 20 );
@@ -1855,5 +1840,5 @@ Features:
      bool dis = !enabled;
      QColorGroup itemg = dis ? pal.disabled() : pal.active();
-@@ -2363,7 +2109,7 @@
+@@ -2363,7 +2103,7 @@
              p->fillRect(x, y, w, h, menuBrush);
          }
@@ -1864,5 +1849,5 @@ Features:
                  p->drawPixmap(x, y, *pix, x, y, w, h);
          }
-@@ -2508,25 +2254,6 @@
+@@ -2508,25 +2248,6 @@
      return h;
  }
@@ -1890,5 +1875,5 @@ Features:
  void LiquidStyle::drawFocusRect(QPainter *p, const QRect &r,
                              const QColorGroup &g, const QColor *c,
-@@ -2536,29 +2263,29 @@
+@@ -2536,29 +2257,29 @@
      if(p->device()->devType() == QInternal::Widget){
          // if so does it use a special focus rectangle?
@@ -1925,5 +1910,5 @@ Features:
      }
      QPixmap tilePix;
-@@ -2671,7 +2398,7 @@
+@@ -2671,7 +2392,7 @@
          vFrame = 8; // was 10
      }
@@ -1934,5 +1919,5 @@ Features:
  
  
-@@ -2699,7 +2426,7 @@
+@@ -2699,7 +2420,7 @@
          p->drawLine(x+1, y+1, x+1, y2-1);
      }
@@ -1943,5 +1928,5 @@ Features:
          QPen oldPen = p->pen();
          int x2 = x+w-1;
-@@ -2726,105 +2453,6 @@
+@@ -2726,105 +2447,6 @@
      }
  }
@@ -2049,5 +2034,5 @@ Features:
  void LiquidStyle::adjustHSV(QPixmap &pix, int h, int s, int v)
  {
-@@ -2988,110 +2616,5 @@
+@@ -2988,110 +2610,5 @@
      }
  }
@@ -2160,5 +2145,5 @@ Features:
  
  /* vim: set noet sw=8 ts=8: */
-        --- -2002-11-21 20:45:47.000000000 +0100
+        --- -2002-11-29 12:30:35.000000000 +0100
         +++ plugin.cpp2002-11-18 18:11:41.000000000 +0100
 @@ -1,29 +1,84 @@