diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-04 10:15:24 -0700 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2018-04-18 17:21:54 +0000 |
commit | 48900145a4e62db95dee812a1d9ac6331e19bc4b (patch) | |
tree | b8be6c93519bbe677210f4916a4291eb095cb570 /src/plugins/styles/mac/qmacstyle_mac_p_p.h | |
parent | be4eaca053eba747c0458e37ce68ae3db1e6a288 (diff) |
QMacStyle: Clean up code, remove dead bits
Change QMacStylePrivate::drawNSViewInRect() signature
to remove all the unused parameters.
Reuse recent tab direction functions where appropriate.
Includes the infamous outter -> outer fix.
Change-Id: I8f92d79d8a6c3b5903bfbb13293afb6f72a5340b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@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 | 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: |