-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 @@ -733,48 +733,54 @@ void PhaseStyle::drawComboButton( QPainter * p, int x, int y, 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 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 @@ -100,48 +100,49 @@ public: 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 ); |