42 #include "qcleanlooksstyle.h" |
42 #include "qcleanlooksstyle.h" |
43 #include "qcleanlooksstyle_p.h" |
43 #include "qcleanlooksstyle_p.h" |
44 |
44 |
45 #if !defined(QT_NO_STYLE_CLEANLOOKS) || defined(QT_PLUGIN) |
45 #if !defined(QT_NO_STYLE_CLEANLOOKS) || defined(QT_PLUGIN) |
46 |
46 |
47 #include <private/qstylehelper_p.h> |
|
48 #include "qwindowsstyle_p.h" |
47 #include "qwindowsstyle_p.h" |
49 #include <qcombobox.h> |
48 #include <qcombobox.h> |
50 #include <qpushbutton.h> |
49 #include <qpushbutton.h> |
51 #include <qpainter.h> |
50 #include <qpainter.h> |
52 #include <qdir.h> |
51 #include <qdir.h> |
65 #include <qsplitter.h> |
64 #include <qsplitter.h> |
66 #include <qprogressbar.h> |
65 #include <qprogressbar.h> |
67 #include <qtoolbar.h> |
66 #include <qtoolbar.h> |
68 #include <qwizard.h> |
67 #include <qwizard.h> |
69 #include <qlibrary.h> |
68 #include <qlibrary.h> |
|
69 #include <private/qstylehelper_p.h> |
70 |
70 |
71 #define CL_MAX(a,b) (a)>(b) ? (a):(b) // ### qMin/qMax does not work for vc6 |
71 #define CL_MAX(a,b) (a)>(b) ? (a):(b) // ### qMin/qMax does not work for vc6 |
72 #define CL_MIN(a,b) (a)<(b) ? (a):(b) // remove this when it is working |
72 #define CL_MIN(a,b) (a)<(b) ? (a):(b) // remove this when it is working |
73 |
73 |
74 QT_BEGIN_NAMESPACE |
74 QT_BEGIN_NAMESPACE |
1395 dark.lighter(130), 60); |
1395 dark.lighter(130), 60); |
1396 QColor tabFrameColor = mergedColors(option->palette.background().color(), |
1396 QColor tabFrameColor = mergedColors(option->palette.background().color(), |
1397 dark.lighter(135), 60); |
1397 dark.lighter(135), 60); |
1398 |
1398 |
1399 QColor highlight = option->palette.highlight().color(); |
1399 QColor highlight = option->palette.highlight().color(); |
1400 QColor highlightText = option->palette.highlightedText().color(); |
|
1401 |
1400 |
1402 switch(element) { |
1401 switch(element) { |
1403 case CE_RadioButton: //fall through |
1402 case CE_RadioButton: //fall through |
1404 case CE_CheckBox: |
1403 case CE_CheckBox: |
1405 if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) { |
1404 if (const QStyleOptionButton *btn = qstyleoption_cast<const QStyleOptionButton *>(option)) { |
2721 } else |
2720 } else |
2722 #endif // QT3_SUPPORT |
2721 #endif // QT3_SUPPORT |
2723 { |
2722 { |
2724 // Fill title bar gradient |
2723 // Fill title bar gradient |
2725 QColor titlebarColor = QColor(active ? highlight: palette.background().color()); |
2724 QColor titlebarColor = QColor(active ? highlight: palette.background().color()); |
2726 QColor titleBarGradientStop(active ? highlight.darker(150): palette.background().color().darker(120)); |
|
2727 QLinearGradient gradient(option->rect.center().x(), option->rect.top(), |
2725 QLinearGradient gradient(option->rect.center().x(), option->rect.top(), |
2728 option->rect.center().x(), option->rect.bottom()); |
2726 option->rect.center().x(), option->rect.bottom()); |
2729 |
2727 |
2730 gradient.setColorAt(0, titlebarColor.lighter(114)); |
2728 gradient.setColorAt(0, titlebarColor.lighter(114)); |
2731 gradient.setColorAt(0.5, titlebarColor.lighter(102)); |
2729 gradient.setColorAt(0.5, titlebarColor.lighter(102)); |
2984 bool horizontal = scrollBar->orientation == Qt::Horizontal; |
2982 bool horizontal = scrollBar->orientation == Qt::Horizontal; |
2985 bool sunken = scrollBar->state & State_Sunken; |
2983 bool sunken = scrollBar->state & State_Sunken; |
2986 |
2984 |
2987 painter->fillRect(option->rect, option->palette.background()); |
2985 painter->fillRect(option->rect, option->palette.background()); |
2988 |
2986 |
2989 QRect rect = scrollBar->rect; |
|
2990 QRect scrollBarSubLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget); |
2987 QRect scrollBarSubLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget); |
2991 QRect scrollBarAddLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget); |
2988 QRect scrollBarAddLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget); |
2992 QRect scrollBarSlider = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSlider, widget); |
2989 QRect scrollBarSlider = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSlider, widget); |
2993 QRect grooveRect = proxy()->subControlRect(control, scrollBar, SC_ScrollBarGroove, widget); |
2990 QRect grooveRect = proxy()->subControlRect(control, scrollBar, SC_ScrollBarGroove, widget); |
2994 |
2991 |
3712 */ |
3709 */ |
3713 int QCleanlooksStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const |
3710 int QCleanlooksStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const |
3714 { |
3711 { |
3715 int ret = -1; |
3712 int ret = -1; |
3716 switch (metric) { |
3713 switch (metric) { |
|
3714 case PM_ToolTipLabelFrameWidth: |
|
3715 ret = 2; |
|
3716 break; |
3717 case PM_ButtonDefaultIndicator: |
3717 case PM_ButtonDefaultIndicator: |
3718 ret = 0; |
3718 ret = 0; |
3719 break; |
3719 break; |
3720 case PM_ButtonShiftHorizontal: |
3720 case PM_ButtonShiftHorizontal: |
3721 case PM_ButtonShiftVertical: |
3721 case PM_ButtonShiftVertical: |