-rw-r--r-- | library/qpestyle.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/library/qpestyle.cpp b/library/qpestyle.cpp index dfd300f..665910c 100644 --- a/library/qpestyle.cpp +++ b/library/qpestyle.cpp | |||
@@ -16,13 +16,13 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "qpestyle.h" | 21 | #include "qpestyle.h" |
22 | #include "qpeapplication.h" | 22 | #include <qpe/qpeapplication.h> |
23 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | 24 | ||
25 | #include <qpainter.h> | 25 | #include <qpainter.h> |
26 | 26 | ||
27 | #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) | 27 | #define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) |
28 | 28 | ||
@@ -221,13 +221,13 @@ void QPEStyle::drawControl( ControlElement ce, QPainter *p, | |||
221 | p->setPen( cg.button() ); | 221 | p->setPen( cg.button() ); |
222 | p->drawLine( r2.left()+2, r2.top()+1, r2.right()-2, r2.top()+1 ); | 222 | p->drawLine( r2.left()+2, r2.top()+1, r2.right()-2, r2.top()+1 ); |
223 | p->fillRect( QRect( r2.left()+1, r2.top()+2, r2.width()-2, r2.height()-3), | 223 | p->fillRect( QRect( r2.left()+1, r2.top()+2, r2.width()-2, r2.height()-3), |
224 | cg.brush( QColorGroup::Button )); | 224 | cg.brush( QColorGroup::Button )); |
225 | 225 | ||
226 | //do shading; will not work for pixmap brushes | 226 | //do shading; will not work for pixmap brushes |
227 | QColor bg = cg.button(); | 227 | QColor bg = cg.button(); |
228 | // int h,s,v; | 228 | // int h,s,v; |
229 | // bg.hsv( &h, &s, &v ); | 229 | // bg.hsv( &h, &s, &v ); |
230 | int n = r2.height()/2; | 230 | int n = r2.height()/2; |
231 | int dark = 100; | 231 | int dark = 100; |
232 | for ( int i = 1; i < n; i++ ) { | 232 | for ( int i = 1; i < n; i++ ) { |
233 | dark = (dark * (100+(i*15)/n) )/100; | 233 | dark = (dark * (100+(i*15)/n) )/100; |
@@ -530,14 +530,14 @@ void QPEStyle::drawBevelButton( QPainter *p, int x, int y, int w, int h, | |||
530 | } | 530 | } |
531 | 531 | ||
532 | QRect QPEStyle::comboButtonRect( int x, int y, int w, int h) | 532 | QRect QPEStyle::comboButtonRect( int x, int y, int w, int h) |
533 | { | 533 | { |
534 | return QRect(x+1, y+1, w-2-14, h-2); | 534 | return QRect(x+1, y+1, w-2-14, h-2); |
535 | } | 535 | } |
536 | 536 | ||
537 | 537 | ||
538 | QRect QPEStyle::comboButtonFocusRect( int x, int y, int w, int h) | 538 | QRect QPEStyle::comboButtonFocusRect( int x, int y, int w, int h) |
539 | { | 539 | { |
540 | return QRect(x+2, y+2, w-4-14, h-4); | 540 | return QRect(x+2, y+2, w-4-14, h-4); |
541 | } | 541 | } |
542 | 542 | ||
543 | void QPEStyle::drawComboButton( QPainter *p, int x, int y, int w, int h, | 543 | void QPEStyle::drawComboButton( QPainter *p, int x, int y, int w, int h, |
@@ -915,13 +915,13 @@ void QPEStyle::drawTab( QPainter *p, const QTabBar *tb, QTab *t, bool selected ) | |||
915 | p->setPen( tb->colorGroup().button() ); | 915 | p->setPen( tb->colorGroup().button() ); |
916 | p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 ); | 916 | p->drawLine( r.left()+2, r.top()+1, r.right()-2, r.top()+1 ); |
917 | p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-3), | 917 | p->fillRect( QRect( r.left()+1, r.top()+2, r.width()-2, r.height()-3), |
918 | tb->colorGroup().brush( QColorGroup::Button )); | 918 | tb->colorGroup().brush( QColorGroup::Button )); |
919 | 919 | ||
920 | //do shading; will not work for pixmap brushes | 920 | //do shading; will not work for pixmap brushes |
921 | QColor bg = tb->colorGroup().button(); | 921 | QColor bg = tb->colorGroup().button(); |
922 | // int h,s,v; | 922 | // int h,s,v; |
923 | // bg.hsv( &h, &s, &v ); | 923 | // bg.hsv( &h, &s, &v ); |
924 | int n = r.height()/2; | 924 | int n = r.height()/2; |
925 | int dark = 100; | 925 | int dark = 100; |
926 | for ( int i = 1; i < n; i++ ) { | 926 | for ( int i = 1; i < n; i++ ) { |
927 | dark = (dark * (100+(i*15)/n) )/100; | 927 | dark = (dark * (100+(i*15)/n) )/100; |
@@ -1025,13 +1025,13 @@ int QPEStyle::extraPopupMenuItemWidth( bool checkable, int maxpmw, QMenuItem* mi | |||
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | /*! \reimp | 1027 | /*! \reimp |
1028 | */ | 1028 | */ |
1029 | int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm ) | 1029 | int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFontMetrics& fm ) |
1030 | { | 1030 | { |
1031 | #ifndef QT_NO_MENUDATA | 1031 | #ifndef QT_NO_MENUDATA |
1032 | int h = 0; | 1032 | int h = 0; |
1033 | if ( mi->isSeparator() ) // separator height | 1033 | if ( mi->isSeparator() ) // separator height |
1034 | h = motifSepHeight; | 1034 | h = motifSepHeight; |
1035 | else if ( mi->pixmap() ) // pixmap height | 1035 | else if ( mi->pixmap() ) // pixmap height |
1036 | h = mi->pixmap()->height() + 2*motifItemFrame; | 1036 | h = mi->pixmap()->height() + 2*motifItemFrame; |
1037 | else // text height | 1037 | else // text height |
@@ -1047,13 +1047,13 @@ int QPEStyle::popupMenuItemHeight( bool /*checkable*/, QMenuItem* mi, const QFon | |||
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi, | 1049 | void QPEStyle::drawPopupMenuItem( QPainter* p, bool checkable, int maxpmw, int tab, QMenuItem* mi, |
1050 | const QPalette& pal, | 1050 | const QPalette& pal, |
1051 | bool act, bool enabled, int x, int y, int w, int h) | 1051 | bool act, bool enabled, int x, int y, int w, int h) |
1052 | { | 1052 | { |
1053 | #ifndef QT_NO_MENUDATA | 1053 | #ifndef QT_NO_MENUDATA |
1054 | const QColorGroup & g = pal.active(); | 1054 | const QColorGroup & g = pal.active(); |
1055 | bool dis = !enabled; | 1055 | bool dis = !enabled; |
1056 | QColorGroup itemg = dis ? pal.disabled() : pal.active(); | 1056 | QColorGroup itemg = dis ? pal.disabled() : pal.active(); |
1057 | 1057 | ||
1058 | if ( checkable ) | 1058 | if ( checkable ) |
1059 | maxpmw = QMAX( maxpmw, 8 ); // space for the checkmarks | 1059 | maxpmw = QMAX( maxpmw, 8 ); // space for the checkmarks |