diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-05-11 20:42:07 +0700 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-05-15 22:39:28 +0000 |
| commit | 639d6c4d0dbccf6824dc07803ea7de163c3c5eec (patch) | |
| tree | f6ab694361cbef963f369d39149d0e04a4abcfeb /src/plugins/styles/mac/qmacstyle_mac_p_p.h | |
| parent | 33833d42254a62e39a96afda11c43ab8688b1772 (diff) | |
QMacStyle: Replace QAquaWidgetSize with WidgetSizePolicy
No need to have two enums for the exact same purpose.
qmacstyle auto-test updated as well.
Change-Id: Ia601648191e39c0cbbaa7477143441005ae063c2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/styles/mac/qmacstyle_mac_p_p.h')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p_p.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h index d13ef0fdbf..6c2dc9f247 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -133,9 +133,6 @@ QT_BEGIN_NAMESPACE #define CT1(c) CT2(c, c) #define CT2(c1, c2) ((uint(c1) << 16) | uint(c2)) -enum QAquaWidgetSize { QAquaSizeLarge = 0, QAquaSizeSmall = 1, QAquaSizeMini = 2, - QAquaSizeUnknown = -1 }; - enum QCocoaWidgetKind { QCocoaArrowButton, // Disclosure triangle, like in QTreeView QCocoaCheckBox, @@ -148,12 +145,12 @@ enum QCocoaWidgetKind { QCocoaVerticalSlider }; -typedef QPair<QCocoaWidgetKind, QAquaWidgetSize> QCocoaWidget; +typedef QPair<QCocoaWidgetKind, QStyleHelper::WidgetSizePolicy> QCocoaWidget; typedef void (^QCocoaDrawRectBlock)(NSRect, CGContextRef); #define SIZE(large, small, mini) \ - (controlSize == QAquaSizeLarge ? (large) : controlSize == QAquaSizeSmall ? (small) : (mini)) + (controlSize == QStyleHelper::SizeLarge ? (large) : controlSize == QStyleHelper::SizeSmall ? (small) : (mini)) // same as return SIZE(...) but optimized #define return_SIZE(large, small, mini) \ @@ -186,10 +183,10 @@ public: enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen, AquaScrollBar }; static ThemeDrawState getDrawState(QStyle::State flags); - QAquaWidgetSize aquaSizeConstrain(const QStyleOption *option, const QWidget *widg, + QStyleHelper::WidgetSizePolicy aquaSizeConstrain(const QStyleOption *option, const QWidget *widg, QStyle::ContentsType ct = QStyle::CT_CustomBase, QSize szHint=QSize(-1, -1), QSize *insz = 0) const; - QAquaWidgetSize effectiveAquaSizeConstrain(const QStyleOption *option, const QWidget *widg, + QStyleHelper::WidgetSizePolicy effectiveAquaSizeConstrain(const QStyleOption *option, const QWidget *widg, QStyle::ContentsType ct = QStyle::CT_CustomBase, QSize szHint=QSize(-1, -1), QSize *insz = 0) const; void getSliderInfo(QStyle::ComplexControl cc, const QStyleOptionSlider *slider, |