diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
commit | cf204590ea94bb3a191b5e783471bd6f5a04ab8e (patch) | |
tree | f96b4dc4c3995b0a3a2d1b8291144846c30baa64 /src/plugins/styles/mac/qmacstyle_mac_p_p.h | |
parent | c579a77f841ed44df25553972f8807110c55808d (diff) | |
parent | 941db4e0bb3170b6bc3cf775f150a226754e6285 (diff) |
Merge 5.11 into 5.11.0
Change-Id: I11c61dc1259ed66d871ecab2666085ccf37a9342
Diffstat (limited to 'src/plugins/styles/mac/qmacstyle_mac_p_p.h')
-rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac_p_p.h | 9 |
1 files changed, 2 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 2a81274765..4eac0a59d6 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -236,13 +236,7 @@ public: // Ideally these wouldn't exist, but since they already exist we need some accessors. static const int PushButtonLeftOffset; - static const int PushButtonTopOffset; static const int PushButtonRightOffset; - static const int PushButtonBottomOffset; - static const int MiniButtonH; - static const int SmallButtonH; - static const int BevelButtonW; - static const int BevelButtonH; static const int PushButtonContentPadding; enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen, AquaScrollBar }; @@ -269,7 +263,7 @@ public: void setupVerticalInvertedXform(CGContextRef cg, bool reverse, bool vertical, const CGRect &rect) const; - void drawNSViewInRect(CocoaControl widget, NSView *view, const QRectF &rect, QPainter *p, bool isQWidget = true, __attribute__((noescape)) DrawRectBlock drawRectBlock = nil) const; + void drawNSViewInRect(NSView *view, const QRectF &rect, QPainter *p, __attribute__((noescape)) DrawRectBlock drawRectBlock = nil) const; void resolveCurrentNSView(QWindow *window) const; void drawFocusRing(QPainter *p, const QRectF &targetRect, int hMargin, int vMargin, const CocoaControl &cw) const; @@ -283,6 +277,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); + static bool verticalTabs(QMacStylePrivate::Direction tabDirection); #endif public: |