-rw-r--r-- | noncore/styles/phase/phasestyle.cpp | 6 | ||||
-rw-r--r-- | noncore/styles/phase/phasestyle.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp index 139505f..ba8c460 100644 --- a/noncore/styles/phase/phasestyle.cpp +++ b/noncore/styles/phase/phasestyle.cpp @@ -565,384 +565,390 @@ int PhaseStyle::popupMenuItemHeight ( bool , } 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 ); 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::tabbarMetrics( const QTabBar* t, int &hframe, int &vframe, int& ov ) { + QCommonStyle::tabbarMetrics( t, hframe, vframe, ov ); + hframe -= 2; + vframe += 1; +} + 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, diff --git a/noncore/styles/phase/phasestyle.h b/noncore/styles/phase/phasestyle.h index ab593e6..cbaa534 100644 --- a/noncore/styles/phase/phasestyle.h +++ b/noncore/styles/phase/phasestyle.h @@ -1,166 +1,167 @@ ////////////////////////////////////////////////////////////////////////////// // phasestyle.h // ------------------- // A style for KDE // ------------------- // Copyright (c) 2004 David Johnson <david@usermode.org> // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to // deal in the Software without restriction, including without limitation the // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or // sell copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: // // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. ////////////////////////////////////////////////////////////////////////////// #ifndef PHASESTYLE_H #define PHASESTYLE_H #include <qstyle.h> #include <qwindowsstyle.h> #include <qcolor.h> class KPixmap; class PhaseStyle : public QWindowsStyle { Q_OBJECT public: PhaseStyle(); virtual ~PhaseStyle(); void polish( QWidget * ); void polish( QPalette& ); void polish( QApplication* ); void drawCheckMark ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, bool act, bool dis ); void drawArrow(QPainter *p, Qt::ArrowType type, bool down, int x, int y, int w, int h, const QColorGroup &g, bool enabled=true, const QBrush *fill = 0); void drawPushButton(QPushButton* btn, QPainter* p ); void drawPushButtonLabel(QPushButton* btn, QPainter* p ); void drawPanel(QPainter* p, int , int, int, int, const QColorGroup&, bool sunken = false, int lineWidth = 1, const QBrush *b = 0l ); void drawButton( QPainter*, int x, int y, int w, int h, const QColorGroup&, bool sunken = false, const QBrush* fill = 0); void drawBevelButton(QPainter*, int, int, int, int, const QColorGroup&, bool sunken = false, const QBrush* fill = 0 ); void drawFocusRect( QPainter* p, const QRect& r, const QColorGroup&, const QColor* = 0, bool atBorder = false ); void drawButtonMask( QPainter* p, int x, int y, int w, int h ); /* Menu Stuff */ void drawSeperator( QPainter* p, int x, int y, int w, int h, const QColorGroup& group, bool sunken = true, int lineWidth = 1, int midLineWidtth = 0 ); void drawMenuBarItem(QPainter* p, int x, int y, int w, int h, QMenuItem *mi, QColorGroup& g, bool enabled, bool act); /* RadioButton, CheckBox... */ void drawIndicator(QPainter* p, int x, int y, int w, int h, const QColorGroup &g, int state, bool down = FALSE, bool enabled = TRUE ); void drawExclusiveIndicator( QPainter*, int, int, int, int, const QColorGroup&, bool on, bool down = false,bool enabled = true ); void drawExclusiveIndicatorMask (QPainter*, int, int, int, int, bool ); /* spacing,dimensions */ int defaultFrameWidth () const; int popupMenuItemHeight ( bool checkable, QMenuItem * mi, const QFontMetrics & fm ); int extraPopupMenuItemWidth(bool checkable, int maxpmw, QMenuItem* mi, const QFontMetrics& fm ); QSize indicatorSize()const; QSize exclusiveIndicatorSize()const; void getButtonShift( int &x, int &y ); /* popup drawing */ void drawPopupMenuItem ( QPainter * p, bool checkable, int maxpmw, int tab, QMenuItem * mi, const QPalette & pal, bool act, bool enabled, int x, int y, int w, int h ); /* combo box */ QRect comboButtonRect ( int x, int y, int w, int h ); void drawComboButton( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, bool sunken = FALSE, bool editable = FALSE, bool enabled = TRUE, const QBrush * fill = 0 ); /* tabbar */ void drawTab(QPainter*, const QTabBar*, QTab*, bool selected ); void drawTabMask( QPainter*, const QTabBar*, QTab*, bool ); + void tabbarMetrics( const QTabBar* t, int &hframe, int &vframe, int &overlap); /* tool button */ void drawToolButton ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, bool sunken = FALSE, const QBrush * fill = 0 ); /* scrollbar */ void drawScrollBarControls ( QPainter *, const QScrollBar *, int sliderStart, uint controls, uint activeControl ); void scrollBarMetrics( const QScrollBar*, int&, int&, int&, int& ); QStyle::ScrollControl scrollBarPointOver( const QScrollBar*, int sliderStart, const QPoint& ); /* slider drawing */ void drawSlider ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, Orientation, bool tickAbove, bool tickBelow ); void drawSliderGroove ( QPainter * p, int x, int y, int w, int h, const QColorGroup & g, QCOORD c, Orientation ); private: void drawPhaseGradient(QPainter* p, const QRect& rec, const QColor& col )const; static void scrollBarItemPositions( const QScrollBar *, const bool horizontal, int sliderStart, int sliderMax, int sliderLength, int buttomDim, QRect& sub, QRect& add, QRect& subPage, QRect& addPage, QRect& slider ); }; #endif |