summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-28 21:12:49 (UTC)
committer zecke <zecke>2004-08-28 21:12:49 (UTC)
commit2bc77ab7c6dd7310f95e70d46f4bfc55a84f32cf (patch) (unidiff)
treefc0730cc591fa106c03b7e9ab525a97a34e1fc3b
parent2fa06314f2779b77de9c07c4f9fbd8cb5af8f215 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/phase/phasestyle.cpp7
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
@@ -727,29 +727,28 @@ QRect PhaseStyle::comboButtonRect ( int x, int y, int w, int h ) {
727} 727}
728 728
729void PhaseStyle::drawComboButton( QPainter * p, int x, int y, 729void PhaseStyle::drawComboButton( QPainter * p, int x, int y,
730 int w, int h, 730 int w, int h,
731 const QColorGroup & g, 731 const QColorGroup & g,
732 bool sunken, 732 bool sunken,
733 bool editable, 733 bool editable,
734 bool, 734 bool,
735 const QBrush *) { 735 const QBrush *) {
736 drawButton(p, x, y, w, h, g, 736 drawButton(p, x, y, w, h, g,
737 sunken, &g.brush(QColorGroup::Button )); 737 sunken, &g.brush(QColorGroup::Button ));
738 738
739 for ( int n = 0; n < 2; ++n )
740 kColorBitmaps(p, g, w-16+(6*n), y+(h/2)-2,
741 0, &doodad_mid, &doodad_light, 0, 0, 0 );
739 742
740 bool odd = (h % 2);
741 drawPanel(p, w-15 , y+(h/2)-3, 10, (odd ? 7 : 6 ),
742 g, true , 1, sunken ? &g.brush(QColorGroup::Midlight)
743 : &g.brush(QColorGroup::Mid) );
744 743
745 if (editable ) { 744 if (editable ) {
746 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;
747 p->setPen(g.dark()); 746 p->setPen(g.dark());
748 p->drawLine(x2+1, y, x2+1, y2); 747 p->drawLine(x2+1, y, x2+1, y2);
749 p->setPen(g.midlight()); 748 p->setPen(g.midlight());
750 p->drawLine(x2+2, y, x2+2, y2-1); 749 p->drawLine(x2+2, y, x2+2, y2-1);
751 p->setPen(g.button()); 750 p->setPen(g.button());
752 p->drawPoint(x2+2, y2); 751 p->drawPoint(x2+2, y2);
753 } 752 }
754 753
755 p->setPen(g.buttonText() ); 754 p->setPen(g.buttonText() );