author | zecke <zecke> | 2004-08-28 21:12:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-08-28 21:12:49 (UTC) |
commit | 2bc77ab7c6dd7310f95e70d46f4bfc55a84f32cf (patch) (side-by-side diff) | |
tree | fc0730cc591fa106c03b7e9ab525a97a34e1fc3b | |
parent | 2fa06314f2779b77de9c07c4f9fbd8cb5af8f215 (diff) | |
download | opie-2bc77ab7c6dd7310f95e70d46f4bfc55a84f32cf.zip opie-2bc77ab7c6dd7310f95e70d46f4bfc55a84f32cf.tar.gz opie-2bc77ab7c6dd7310f95e70d46f4bfc55a84f32cf.tar.bz2 |
Use the bitmap found on the scrollbar as combobox
indicator.
A push effect is missing for that though
-rw-r--r-- | noncore/styles/phase/phasestyle.cpp | 7 |
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 @@ -355,773 +355,772 @@ void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) { if (button->isMenuButton()) { // draw the indicator //dx = pixelMetric(PM_MenuButtonIndicator, widget); int dx = menuButtonIndicatorWidth( button->height() ); drawArrow(painter, Qt::DownArrow, active, x+w-dx, y+2, dx-4, h-4, group,button->isEnabled() ); w -= dx; } if (button->iconSet() && !button->iconSet()->isNull()) { // draw icon if (button->isEnabled()) { if (button->hasFocus()) { mode = QIconSet::Active; } else { mode = QIconSet::Normal; } } else { mode = QIconSet::Disabled; } #if 0 if (button->isToggleButton() && button->isOn()) { state = true; } else { state = false; } #endif pixmap = button->iconSet()->pixmap(QIconSet::Small, mode); if (button->text().isEmpty() && !button->pixmap()) { painter->drawPixmap(x+w/2 - pixmap.width()/2, y+h/2 - pixmap.height()/2, pixmap); } else { painter->drawPixmap(x+4, y+h/2 - pixmap.height()/2, pixmap); } x += pixmap.width() + 4; w -= pixmap.width() + 4; } if (active || button->isDefault()) { // default button for(int n=0; n<2; n++) { drawItem(painter, x+n, y, w, h, AlignCenter | ShowPrefix, button->colorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, (button->isEnabled()) ? &button->colorGroup().buttonText() : &button->colorGroup().mid()); } } else { // normal button drawItem(painter, x, y, w, h, AlignCenter | ShowPrefix, button->colorGroup(), button->isEnabled(), button->pixmap(), button->text(), -1, (button->isEnabled()) ? &button->colorGroup().buttonText() : &button->colorGroup().mid()); } } void PhaseStyle::drawFocusRect(QPainter *painter, const QRect &rect, const QColorGroup &group, const QColor *, bool atBorder) { QPen old = painter->pen(); painter->setPen(group.highlight().dark(contrast)); painter->setBrush(NoBrush); if ( atBorder ) painter->drawRect(QRect(rect.x()+1, rect.y()+1, rect.width()-2, rect.height()-2 )); else painter->drawRect(rect); painter->setPen(old); } void PhaseStyle::drawSeperator( QPainter* painter, int x, int y, int w, int h, const QColorGroup& group, bool, int , int ) { qWarning( "Seperator" ); QRect rect(x, y, w, h); int x2 = rect.right(); int y2 = rect.bottom(); painter->setPen(group.dark()); if (w < h) painter->drawLine(w/2, y, w/2, y2); else painter->drawLine(x, h/2, x2, h/2); } void PhaseStyle::drawMenuBarItem(QPainter* p, int x, int y, int w, int h, QMenuItem *mi, QColorGroup& g, bool enabled, bool act ) { return QWindowsStyle::drawMenuBarItem(p, x, y, w, h, mi, g, enabled, act); } void PhaseStyle::drawIndicator(QPainter* painter, int x, int y, int w, int h, const QColorGroup &group, int state, bool, bool enabled ) { drawPanel(painter, x, y, w, h, group, true, 1, enabled ? &group.brush(QColorGroup::Base) : &group.brush(QColorGroup::Background)); if (QButton::On == state ) { painter->setPen(group.dark()); painter->drawRect(x+3, y+3, w-6, h-6); painter->fillRect(x+4, y+4, w-8, h-8, group.brush(QColorGroup::Highlight)); } } void PhaseStyle::drawExclusiveIndicator(QPainter* painter, int x, int y, int w, int h, const QColorGroup &group, bool on, bool /*down*/, bool enabled) { QRect r(x, y, w, h ); /* * As Polygon and Polyline are broken in Qt2 lets use * something not that spectacilur -> ellipse */ painter->save(); painter->fillRect(x, y, w, h, group.background()); painter->setBrush(enabled ? group.brush(QColorGroup::Base) : group.brush(QColorGroup::Background)); painter->setPen(group.dark()); if (0 == w % 2) --w; if (0 == h % 2) --h; painter->drawEllipse(x, y, w, h ); if(on) { painter->setBrush(group.brush(QColorGroup::Highlight)); painter->drawEllipse(x+3,y+3,w-6,h-6); } painter->restore(); } /* * Does not get called in QWS as it seems */ void PhaseStyle::drawExclusiveIndicatorMask(QPainter *painter, int x, int y, int w, int h, bool /*on*/ ) { return; if (0 != w%2) --w; if (0 != h%2) --h; QRect r(x, y, w, h ); int x2 = r.right(); int y2 = r.bottom(); int cx = (x + x2) / 2; int cy = (y + y2) / 2; QPointArray parray; painter->setBrush(Qt::color1); painter->setPen(Qt::color1); parray.putPoints(0, 8, x,cy+1, x,cy, cx,y, cx+1,y, x2,cy, x2,cy+1, cx+1,y2, cx,y2); painter->drawPolygon(parray, 0, 8); } int PhaseStyle::defaultFrameWidth()const { return 1; } int PhaseStyle::popupMenuItemHeight ( bool , QMenuItem * mi, const QFontMetrics & fm ) { int h = 0; if (mi->custom() ) { h = mi->custom()->sizeHint().height(); if (!mi->custom()->fullSpan() ) h += ITEMVMARGIN*2 + ITEMFRAME*2; }else if (mi->isSeparator() ) { h = 1; }else { if ( mi->pixmap() ) { h = QMAX(h, mi->pixmap()->height() + ITEMFRAME*2); }else { h = QMAX(h, MINICONSIZE+ITEMFRAME*2 ); h = QMAX(h, fm.height() + ITEMVMARGIN*2 + ITEMFRAME*2 ); } if ( mi->iconSet() ) h = QMAX(h, mi->iconSet()-> pixmap(QIconSet::Small, QIconSet::Normal ).height() + ITEMFRAME*2 ); } return h; } int PhaseStyle::extraPopupMenuItemWidth(bool checkable, int maxpmw, QMenuItem* mi, const QFontMetrics& ) { int w = 0; if (mi->isSeparator() ) return 3; else if ( mi->pixmap() ) w = mi->pixmap()->width(); if (!mi->text().isNull() && mi->text().find('\t' ) >= 0 ) w += 12; else if ( mi->popup() ) w += 2*ARROWMARGIN; if ( maxpmw ) w += maxpmw +4; if ( maxpmw > 0 || checkable ) w += ITEMHMARGIN*2+8; w += RIGHTBORDER; return w; } QSize PhaseStyle::indicatorSize()const { return QSize( 11, 11 ); } QSize PhaseStyle::exclusiveIndicatorSize()const { return QSize( 11, 11 ); } void PhaseStyle::getButtonShift( int &x, int &y ) { x++; y++; } void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable, int maxpmw,int tabwidth, QMenuItem * mi, const QPalette & pal, bool act, bool enabled, int x, int y, int w, int 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 = mi->iconSet()->pixmap(QIconSet::Small, mode ); 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 ); } } 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) ); // draw tab painter->setPen(group.dark()); painter->drawLine(x, y, x, y2-2); painter->drawLine(x+1, y, x2, y); painter->drawLine(x2, y+1, x2, y2-2); painter->setPen(group.mid()); painter->drawLine(x2-1, y+2, x2-1, y2-2); painter->setPen(group.midlight()); painter->drawLine(x+1, y+1, x2-2, y+1); if ((selected) || edge) painter->drawLine(x+1, y+2, x+1, y2-2); // finish off bottom if (selected) { painter->setPen(group.dark()); painter->drawPoint(x, y2-1); painter->drawPoint(x2, y2-1); painter->setPen(group.midlight()); painter->drawPoint(x, y2); painter->drawLine(x+1, y2-1, x+1, y2); painter->drawPoint(x2, y2); painter->setPen(group.mid()); painter->drawPoint(x2-1, y2-1); if (edge) { painter->setPen(group.dark()); painter->drawLine(x, y2-1, x, y2); painter->setPen(group.midlight()); painter->drawPoint(x+1, y2); } } else { painter->setPen(group.dark()); painter->drawLine(x, y2-1, x2, y2-1); painter->setPen(group.midlight()); painter->drawLine(x, y2, x2, y2); if (edge) { painter->setPen(group.dark()); painter->drawLine(x, y2-1, x, y2); } } break; } case QTabBar::RoundedBelow: case QTabBar::TriangularBelow: { painter->setBrush( group.background().dark(contrast)); painter->setPen(Qt::NoPen); painter->fillRect(x+1, y+1, w-1, h-1, painter->brush()); // draw tab painter->setPen(group.dark()); painter->drawLine(x, y+1, x, y2); painter->drawLine(x+1, y2, x2, y2); painter->drawLine(x2, y+1, x2, y2-1); painter->setPen(group.mid()); painter->drawLine(x2-1, y+1, x2-1, y2-1); painter->drawLine(x+2, y2-1, x2-1, y2-1); painter->drawPoint(x, y); painter->drawPoint(x2, y); if ((selected) || edge) { painter->setPen(group.midlight()); painter->drawLine(x+1, y+1, x+1, y2-2); } // finish off top if (selected) { if (edge) { painter->setPen(group.dark()); painter->drawPoint(x, y); painter->setPen(group.midlight()); painter->drawPoint(x+1, y); } } else { painter->setPen(group.dark()); painter->drawLine(x, y+1, x2, y+1); painter->setPen(group.mid()); painter->drawLine(x, y, x2, y); if (edge) { painter->setPen(group.dark()); painter->drawPoint(x, y); } } break; } } painter->restore(); } void PhaseStyle::drawTabMask( QPainter* p, const QTabBar*, QTab* tab, bool ) { p->fillRect(tab->rect(), Qt::color1); } void PhaseStyle::drawToolButton(QPainter * p, int x, int y, int w, int h, const QColorGroup & g, bool sunken, const QBrush * fill ) { QRect r(x, y, w, h ); p->fillRect(r, g.background()); drawPanel(p, x, y, w, h, g, sunken, 1, fill ? fill : &g.brush(QColorGroup::Button) ); p->setPen(g.text() ); } /* * LGPLv2 Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> * * ../web/webstyle.cpp */ void PhaseStyle::scrollBarMetrics(const QScrollBar* sb, int& sliderMin, int& sliderMax, int &sliderLength, int& buttonDim ) { int maxlen; bool horizontal = sb->orientation() == QScrollBar::Horizontal; int len = (horizontal) ? sb->width() : sb->height(); int extent = (horizontal) ? sb->height() : sb->width(); if (len > (extent - 1) * 2) buttonDim = extent; else buttonDim = len / 2 - 1; if (horizontal) sliderMin = buttonDim * 2; else sliderMin = 1; maxlen = len - buttonDim * 2 - 1; int div = QMAX(1, (sb->maxValue() - sb->minValue() + sb->pageStep() ) ); sliderLength = (sb->pageStep() * maxlen) / div; if (sliderLength < SCROLLBAR_EXTENT) sliderLength = SCROLLBAR_EXTENT; if (sliderLength > maxlen) sliderLength = maxlen; sliderMax = sliderMin + maxlen - sliderLength; } void PhaseStyle::drawScrollBarControls( QPainter* p, const QScrollBar *sb, int sliderStart, uint controls, uint activeControl) { const bool horizontal = (sb->orientation() == Qt::Horizontal ); int sliderMin, sliderMax, sliderLength, buttonDim; const QColorGroup& g = sb->colorGroup(); QRect sub, add, subPage, addPage, slider; int x, y, x2, y2; scrollBarMetrics( sb, sliderMin, sliderMax, sliderLength, buttonDim ); /* lets get the positions */ scrollBarItemPositions(sb, horizontal, sliderStart, sliderMax, sliderLength, buttonDim, sub, add, subPage, addPage, slider ); /* sanity */ if ( sliderStart > sliderMax ) sliderStart = sliderMax; // addline if ( controls & AddLine && add.isValid() ) { x = add.x(); y = add.y(); x2 = add.width(); y2 = add.height(); const bool down = (activeControl & AddLine ); drawBevelButton(p, x, y, x2, y2, g, down, &g.brush(QColorGroup::Button)); Qt::ArrowType arrow = horizontal ? RightArrow : DownArrow; if (down ) { switch (arrow ) { case DownArrow: y++; break; case RightArrow: x++; break; default: break; } } drawArrow( p, arrow, down, x, y, x2, y2, g, true ); } if ( controls & SubLine && sub.isValid() ) { x = sub.x(); y = sub.y(); x2 = sub.width(); y2 = sub.height(); const bool down = (activeControl & SubLine ); drawBevelButton(p, x, y, x2, y2, g, down, &g.brush(QColorGroup::Button)); Qt::ArrowType arrow = horizontal ? LeftArrow : UpArrow; if (down ) { switch (arrow ) { case UpArrow: y--; break; case LeftArrow: x--; break; default: break; } } drawArrow( p, arrow, down, x, y, x2, y2, g, true ); } if ( controls & AddPage && addPage.isValid() ) { x = addPage.x(); y = addPage.y(); x2 = addPage.right(); y2 = addPage.bottom(); p->fillRect(addPage, g.mid()); p->setPen(g.dark()); if (horizontal) { // vertical p->drawLine(x, y, x2, y); p->drawLine(x, y2, x2, y2); } else { // horizontal p->drawLine(x, y, x, y2); p->drawLine(x2, y, x2, y2); } } if ( controls & SubPage && subPage.isValid() ) { x = subPage.x(); y = subPage.y(); x2 = subPage.right(); y2 = subPage.bottom(); p->fillRect(subPage, g.mid()); p->setPen(g.dark()); if (horizontal) { // vertical p->drawLine(x, y, x2, y); p->drawLine(x, y2, x2, y2); } else { // horizontal p->drawLine(x, y, x, y2); p->drawLine(x2, y, x2, y2); } } if ( controls & Slider && slider.isValid() ) { x = slider.x(); y = slider.y(); x2 = slider.width(); y2 = slider.height(); const bool down = ( activeControl & Slider ); int cx = x + x2/2 -2; int cy = y + y2/2 -2; drawBevelButton(p, x, y, x2, y2, g, down, &g.brush(QColorGroup::Button) ); if (horizontal && (x2 >=20)) { for (int n = -5; n <= 5; n += 5) kColorBitmaps(p, g, cx+n, cy, 0, &doodad_mid, &doodad_light, 0, 0, 0); } else if (!horizontal && (y2 >= 20)) { for (int n = -5; n <= 5; n += 5) kColorBitmaps(p, g, cx, cy+n, 0, &doodad_mid, &doodad_light, 0, 0, 0); } if ( sb->hasFocus() && down ) { slider = QRect(slider.x()+2, slider.y()+2, slider.width()-2, slider.height()-2 ); drawFocusRect(p, slider, g, false ); } } } /* * LGPLv2 Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> * * ../web/webstyle.cpp */ QStyle::ScrollControl PhaseStyle::scrollBarPointOver( const QScrollBar * sb, int sliderStart, const QPoint & point ) { if (!sb->rect().contains(point)) return NoScroll; int sliderMin, sliderMax, sliderLength, buttonDim; scrollBarMetrics(sb, sliderMin, sliderMax, sliderLength, buttonDim); if (sb->orientation() == QScrollBar::Horizontal) { int x = point.x(); if (x <= buttonDim) return SubLine; else if (x <= buttonDim * 2) return AddLine; else if (x < sliderStart) return SubPage; else if (x < sliderStart+sliderLength) return Slider; else return AddPage; } else { int y = point.y(); if (y < sliderStart) return SubPage; else if (y < sliderStart + sliderLength) return Slider; else if (y < sliderMax + sliderLength) return AddPage; else if (y < sliderMax + sliderLength + buttonDim) return SubLine; else return AddLine; } } /* * LGPLv2 Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> * * ../web/webstyle.cpp * scrollBarControlsMetrics */ void PhaseStyle::scrollBarItemPositions( const QScrollBar* sb, const bool horizontal, int sliderStart, int sliderMax, int sliderLength, int buttonDim, QRect &rSub, QRect& rAdd, QRect& rSubPage, QRect &rAddPage, QRect& rSlider ) { int len = horizontal ? sb->width() : sb->height(); int extent = horizontal ? sb->height() : sb->width(); QColorGroup g = sb->colorGroup(); if (sliderStart > sliderMax) sliderStart = sliderMax; |