From 7c867195660b4e17dde52b8eb3f10968231e75c3 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 30 Mar 2018 13:57:42 -0700 Subject: QMacStyle: PE_FrameTabWidget in now HITheme-free MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If14e67bdae41099bb87fe2d7c4f65926d325766b Reviewed-by: Morten Johan Sørvig --- src/plugins/styles/mac/qmacstyle_mac_p_p.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/styles/mac/qmacstyle_mac_p_p.h') diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h index 6a92193a02..5ef713a9dc 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -181,6 +181,10 @@ class QMacStylePrivate : public QCommonStylePrivate { Q_DECLARE_PUBLIC(QMacStyle) public: + enum Direction { + North, South, East, West + }; + enum CocoaControlType { NoControl, // For when there's no such a control in Cocoa Box, // QGroupBox @@ -207,7 +211,6 @@ public: TextField }; - struct CocoaControl { CocoaControl(); CocoaControl(CocoaControlType t, QStyleHelper::WidgetSizePolicy s); @@ -242,7 +245,6 @@ public: static const int PushButtonContentPadding; enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen, AquaScrollBar }; - static ThemeDrawState getDrawState(QStyle::State flags); QStyleHelper::WidgetSizePolicy aquaSizeConstrain(const QStyleOption *option, const QWidget *widg, QStyle::ContentsType ct = QStyle::CT_CustomBase, QSize szHint=QSize(-1, -1), QSize *insz = 0) const; @@ -279,6 +281,7 @@ public: #if QT_CONFIG(tabbar) void tabLayout(const QStyleOptionTab *opt, const QWidget *widget, QRect *textRect, QRect *iconRect) const; + static Direction tabDirection(QTabBar::Shape shape); #endif public: -- cgit v1.2.3