-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 | |||
@@ -715,53 +715,52 @@ void PhaseStyle::drawPopupMenuItem ( QPainter * p, bool checkable, | |||
715 | 715 | ||
716 | if ( mi->popup() ) { // draw submenu arrow | 716 | if ( mi->popup() ) { // draw submenu arrow |
717 | int dim = (h-2*ITEMFRAME) / 2; | 717 | int dim = (h-2*ITEMFRAME) / 2; |
718 | drawArrow( p, RightArrow, false, | 718 | drawArrow( p, RightArrow, false, |
719 | x+w-ARROWMARGIN-ITEMFRAME-dim, | 719 | x+w-ARROWMARGIN-ITEMFRAME-dim, |
720 | y+h/2-dim/2, dim, dim, g, enabled ); | 720 | y+h/2-dim/2, dim, dim, g, enabled ); |
721 | } | 721 | } |
722 | } | 722 | } |
723 | 723 | ||
724 | 724 | ||
725 | QRect PhaseStyle::comboButtonRect ( int x, int y, int w, int h ) { | 725 | QRect PhaseStyle::comboButtonRect ( int x, int y, int w, int h ) { |
726 | return QRect(x+2, y+2, w-4-17, h-5 ); | 726 | return QRect(x+2, y+2, w-4-17, h-5 ); |
727 | } | 727 | } |
728 | 728 | ||
729 | void PhaseStyle::drawComboButton( QPainter * p, int x, int y, | 729 | void 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() ); |
756 | } | 755 | } |
757 | 756 | ||
758 | 757 | ||
759 | void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab, | 758 | void PhaseStyle::drawTab(QPainter* painter, const QTabBar* bar, QTab* tab, |
760 | bool selected ) { | 759 | bool selected ) { |
761 | bool edge = false; | 760 | bool edge = false; |
762 | int x, y, w, h; | 761 | int x, y, w, h; |
763 | QRect r = tab->rect(); | 762 | QRect r = tab->rect(); |
764 | r.rect(&x,&y,&w,&h); | 763 | r.rect(&x,&y,&w,&h); |
765 | const int x2 = x+w-1; | 764 | const int x2 = x+w-1; |
766 | const int y2 = y+h-1; | 765 | const int y2 = y+h-1; |
767 | const QColorGroup &group = bar->colorGroup(); | 766 | const QColorGroup &group = bar->colorGroup(); |