author | sandman <sandman> | 2002-07-01 09:41:55 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-07-01 09:41:55 (UTC) |
commit | 05d74acac3af056bfd784c6f2b7f72d313ea64bc (patch) (side-by-side diff) | |
tree | 8138f495cdd08fa249bd429ddefc36df26b12a79 /noncore/styles/liquid/liquid.cpp | |
parent | d538fa9811906117a3ea68e3d434a1de7f46fc67 (diff) | |
download | opie-05d74acac3af056bfd784c6f2b7f72d313ea64bc.zip opie-05d74acac3af056bfd784c6f2b7f72d313ea64bc.tar.gz opie-05d74acac3af056bfd784c6f2b7f72d313ea64bc.tar.bz2 |
- Fix a bug in the original liquid regarding slider handles and bg
pixmaps (volume-applet, reported by Harlekin)
- Fix some "unused variable" compiler warnings
- Regenerated QPL diff
Diffstat (limited to 'noncore/styles/liquid/liquid.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/styles/liquid/liquid.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/noncore/styles/liquid/liquid.cpp b/noncore/styles/liquid/liquid.cpp index 9a7d2dd..313d52c 100644 --- a/noncore/styles/liquid/liquid.cpp +++ b/noncore/styles/liquid/liquid.cpp @@ -1826,10 +1826,10 @@ QSize LiquidStyle::exclusiveIndicatorSize() const { return(QSize(16, 16)); } -void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int w, - int h, const QColorGroup &g, bool on, +void LiquidStyle::drawExclusiveIndicator(QPainter *p, int x, int y, int /*w*/, + int /*h*/, const QColorGroup &/*g*/, bool on, bool down, bool) { bool isHover = highlightWidget == p->device(); bool isMasked = p->device() && p->device()->devType() == QInternal::Widget @@ -1869,10 +1869,10 @@ QSize LiquidStyle::indicatorSize() const { return(QSize(20, 22)); } -void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, int state, bool down, bool) +void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int /*w*/, int /*h*/, + const QColorGroup &/*g*/, int state, bool /*down*/, bool) { bool isHover = highlightWidget == p->device(); bool isMasked = p->device() && p->device()->devType() == QInternal::Widget && ((QWidget*)p->device())->autoMask(); @@ -1908,29 +1908,28 @@ void LiquidStyle::drawIndicator(QPainter *p, int x, int y, int w, int h, p->drawPixmap(x, y, isHover ? *getPixmap(CBHover) : *getPixmap(CB)); } } -void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int w, int h, - int state) +void LiquidStyle::drawIndicatorMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, + int /*state*/) { // needed for some reason by KHtml, even tho it's all filled ;P p->drawPixmap(x, y, *getPixmap(HTMLCB)->mask()); } void LiquidStyle::drawSlider(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, Orientation orient, + const QColorGroup &/*g*/, Orientation orient, bool, bool) { QWidget *parent = (QWidget *)p->device(); p->setBrushOrigin(parent->pos()); - p->fillRect(x, y, w, h, - QApplication::palette().active().brush(QColorGroup::Background)); + parent->erase(x, y, w, h); p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider) : *getPixmap(VSlider)); } -void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int w, int h, +void LiquidStyle::drawSliderMask(QPainter *p, int x, int y, int /*w*/, int /*h*/, Orientation orient, bool, bool) { p->drawPixmap(x, y, orient == Qt::Horizontal ? *getPixmap(HSlider)->mask() : *getPixmap(VSlider)->mask()); @@ -1979,9 +1978,9 @@ void LiquidStyle::drawArrow(QPainter *p, Qt::ArrowType type, bool on, int x, } void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, - QMenuItem *mi, QColorGroup &g, bool enabled, bool active ) + QMenuItem *mi, QColorGroup &g, bool /*enabled*/, bool active ) { x -= 2; // Bug in Qt/E y -= 2; w += 2; @@ -2033,10 +2032,10 @@ void LiquidStyle::drawMenuBarItem(QPainter *p, int x, int y, int w, int h, } } void LiquidStyle::drawPopupPanel(QPainter *p, int x, int y, int w, int h, - const QColorGroup &g, int lineWidth, - const QBrush * fill) + const QColorGroup &g, int /*lineWidth*/, + const QBrush * /*fill*/) { QColor c; switch(menuHandler->transType()){ case None: |