diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-13 17:53:39 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-06 15:48:23 +0200 |
commit | f02dde3d74ec69d2bafa25053ff85e514d950b0e (patch) | |
tree | 51f3ab15414e3d7642f3d2ecd59b2deb92298eb9 /src/plugins/platforms/cocoa | |
parent | 04739ce4b401bdfe766e64deac1bb382ddd954cc (diff) |
Simplify QMainWindow::setUnifiedTitleAndToolBarOnMac
Task-number: QTBUG-83252
Change-Id: Ib6f7dcfe21407603d4cfd5d33f6615d8623db940
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 12 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 5 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index 7d4c5884b3..4f82faf39b 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -105,9 +105,6 @@ private: // deregisters. static void registerTouchWindow(QWindow *window, bool enable); - // Enable the unified title and toolbar area for a window. - static void setContentBorderEnabled(QWindow *window, bool enable); - // Set the size of the unified title and toolbar area. static void setContentBorderThickness(QWindow *window, int topThickness, int bottomThickness); diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 426e413a86..77187f2d20 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -118,8 +118,6 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter return NativeResourceForIntegrationFunction(QCocoaNativeInterface::registerContentBorderArea); if (resource.toLower() == "setcontentborderareaenabled") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setContentBorderAreaEnabled); - if (resource.toLower() == "setcontentborderenabled") - return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setContentBorderEnabled); if (resource.toLower() == "setnstoolbar") return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setNSToolbar); if (resource.toLower() == "testcontentborderposition") @@ -260,16 +258,6 @@ void QCocoaNativeInterface::setContentBorderAreaEnabled(QWindow *window, quintpt cocoaWindow->setContentBorderAreaEnabled(identifier, enable); } -void QCocoaNativeInterface::setContentBorderEnabled(QWindow *window, bool enable) -{ - if (!window) - return; - - QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle()); - if (cocoaWindow) - cocoaWindow->setContentBorderEnabled(enable); -} - void QCocoaNativeInterface::setNSToolbar(QWindow *window, void *nsToolbar) { QCocoaIntegration::instance()->setToolbar(window, static_cast<NSToolbar *>(nsToolbar)); diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index e4debd669d..0c607320f8 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -98,7 +98,8 @@ class QDebug; class QCocoaMenuBar; -class QCocoaWindow : public QObject, public QPlatformWindow +class QCocoaWindow : public QObject, public QPlatformWindow, + public QPlatformInterface::Private::QCocoaWindow { Q_OBJECT public: @@ -192,7 +193,7 @@ public: void setContentBorderThickness(int topThickness, int bottomThickness); void registerContentBorderArea(quintptr identifier, int upper, int lower); void setContentBorderAreaEnabled(quintptr identifier, bool enable); - void setContentBorderEnabled(bool enable); + void setContentBorderEnabled(bool enable) override; bool testContentBorderAreaPosition(int position) const; void applyContentBorderThickness(NSWindow *window = nullptr); void updateNSToolbar(); |