-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 | |||
@@ -745,24 +745,30 @@ void PhaseStyle::drawComboButton( QPainter * p, int x, int y, | |||
745 | const int x2 = x+w-1; const int y2 = y+h-1; | 745 | const int x2 = x+w-1; const int y2 = y+h-1; |
746 | p->setPen(g.dark()); | 746 | p->setPen(g.dark()); |
747 | p->drawLine(x2+1, y, x2+1, y2); | 747 | p->drawLine(x2+1, y, x2+1, y2); |
748 | p->setPen(g.midlight()); | 748 | p->setPen(g.midlight()); |
749 | p->drawLine(x2+2, y, x2+2, y2-1); | 749 | p->drawLine(x2+2, y, x2+2, y2-1); |
750 | p->setPen(g.button()); | 750 | p->setPen(g.button()); |
751 | p->drawPoint(x2+2, y2); | 751 | p->drawPoint(x2+2, y2); |
752 | } | 752 | } |
753 | 753 | ||
754 | p->setPen(g.buttonText() ); | 754 | p->setPen(g.buttonText() ); |
755 | } | 755 | } |
756 | 756 | ||
757 | void PhaseStyle::tabbarMetrics( const QTabBar* t, int &hframe, int &vframe, int& ov ) { | ||
758 | QCommonStyle::tabbarMetrics( t, hframe, vframe, ov ); | ||
759 | hframe -= 2; | ||
760 | vframe += 1; | ||
761 | } | ||
762 | |||
757 | 763 | ||
758 | void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab, | 764 | void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab, |
759 | bool selected ) { | 765 | bool selected ) { |
760 | bool edge = false; | 766 | bool edge = false; |
761 | int x, y, w, h; | 767 | int x, y, w, h; |
762 | QRect r = tab->rect(); | 768 | QRect r = tab->rect(); |
763 | r.rect(&x,&y,&w,&h); | 769 | r.rect(&x,&y,&w,&h); |
764 | const int x2 = x+w-1; | 770 | const int x2 = x+w-1; |
765 | const int y2 = y+h-1; | 771 | const int y2 = y+h-1; |
766 | const QColorGroup &group = bar->colorGroup(); | 772 | const QColorGroup &group = bar->colorGroup(); |
767 | 773 | ||
768 | 774 | ||
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 | |||
@@ -112,24 +112,25 @@ public: | |||
112 | int w, int h, | 112 | int w, int h, |
113 | const QColorGroup & g, | 113 | const QColorGroup & g, |
114 | bool sunken = FALSE, | 114 | bool sunken = FALSE, |
115 | bool editable = FALSE, | 115 | bool editable = FALSE, |
116 | bool enabled = TRUE, | 116 | bool enabled = TRUE, |
117 | const QBrush * fill = 0 ); | 117 | const QBrush * fill = 0 ); |
118 | 118 | ||
119 | /* tabbar */ | 119 | /* tabbar */ |
120 | void drawTab(QPainter*, const QTabBar*, QTab*, | 120 | void drawTab(QPainter*, const QTabBar*, QTab*, |
121 | bool selected ); | 121 | bool selected ); |
122 | void drawTabMask( QPainter*, const QTabBar*, QTab*, | 122 | void drawTabMask( QPainter*, const QTabBar*, QTab*, |
123 | bool ); | 123 | bool ); |
124 | void tabbarMetrics( const QTabBar* t, int &hframe, int &vframe, int &overlap); | ||
124 | 125 | ||
125 | /* tool button */ | 126 | /* tool button */ |
126 | void drawToolButton ( QPainter * p, int x, int y, | 127 | void drawToolButton ( QPainter * p, int x, int y, |
127 | int w, int h, | 128 | int w, int h, |
128 | const QColorGroup & g, | 129 | const QColorGroup & g, |
129 | bool sunken = FALSE, | 130 | bool sunken = FALSE, |
130 | const QBrush * fill = 0 ); | 131 | const QBrush * fill = 0 ); |
131 | 132 | ||
132 | /* scrollbar */ | 133 | /* scrollbar */ |
133 | void drawScrollBarControls ( QPainter *, const QScrollBar *, | 134 | void drawScrollBarControls ( QPainter *, const QScrollBar *, |
134 | int sliderStart, uint controls, | 135 | int sliderStart, uint controls, |
135 | uint activeControl ); | 136 | uint activeControl ); |