Mac: Implement unified toolbar look for QTabBar

Extend the unified title and toolbar gradient to 
tabs in document mode that are adjacent unified
tool bars.

Change the updateMacBorderMetrics() function to
register the tab bar geometry and visibility status
with the Cocoa platform plugin. The Cocoa platform
plugin will then merge this area with other registered
areas if possible.

Add QCocoaNativeInterface::testContentBorderPosition(). 
This function tests whether the given point is within 
the unified title and toolbar area.

Use testContentBorderPosition() in QMacStyle to enable 
code paths that skips drawing the QToolBar bottom 
separator line and paints the active tab background 
with transparent pixels to make the background gradient 
visible.

Change-Id: I2b70f9bb0c2c59af053a691a7df538f958783dab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

4 files changed, 24 insertions, 0 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
index 0318c52628..54e45a1d99 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
@@ -147,6 +147,10 @@ private:
     // Enables or disiables a content border area.
     static void setContentBorderAreaEnabled(QWindow *window, quintptr identifier, bool enable);
 
+    // Returns true if the given coordinate is inside the current
+    // content border.
+    static bool testContentBorderPosition(QWindow *window, int position);
+
     // Sets a NSToolbar instance for the given QWindow. The
     // toolbar will be attached to the native NSWindow when
     // that is created;
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index b18c586212..e09c31231d 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -133,6 +133,8 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setContentBorderEnabled);
     if (resource.toLower() == "setnstoolbar")
         return NativeResourceForIntegrationFunction(QCocoaNativeInterface::setNSToolbar);
+    if (resource.toLower() == "testcontentborderposition")
+        return NativeResourceForIntegrationFunction(QCocoaNativeInterface::testContentBorderPosition);
 
     return 0;
 }
@@ -332,4 +334,15 @@ void QCocoaNativeInterface::setNSToolbar(QWindow *window, void *nsToolbar)
         cocoaWindow->updateNSToolbar();
 }
 
+bool QCocoaNativeInterface::testContentBorderPosition(QWindow *window, int position)
+{
+    if (!window)
+        return false;
+
+    QCocoaWindow *cocoaWindow = static_cast<QCocoaWindow *>(window->handle());
+    if (cocoaWindow)
+        return cocoaWindow->testContentBorderAreaPosition(position);
+    return false;
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index d8eb0ed0bd..7a01835d5b 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -213,6 +213,7 @@ public:
     void registerContentBorderArea(quintptr identifier, int upper, int lower);
     void setContentBorderAreaEnabled(quintptr identifier, bool enable);
     void setContentBorderEnabled(bool enable);
+    bool testContentBorderAreaPosition(int position) const;
     void applyContentBorderThickness(NSWindow *window);
     void updateNSToolbar();
 
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 515e2bf132..5a4ac9b2cc 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -1665,6 +1665,12 @@ void QCocoaWindow::updateNSToolbar()
     [m_nsWindow setShowsToolbarButton:YES];
 }
 
+bool QCocoaWindow::testContentBorderAreaPosition(int position) const
+{
+    return m_nsWindow && m_drawContentBorderGradient &&
+            0 <= position && position < [m_nsWindow contentBorderThicknessForEdge: NSMaxYEdge];
+}
+
 qreal QCocoaWindow::devicePixelRatio() const
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7