Set unified toolbar height accurately.

Add registerContentBorderArea() to the Cocoa native
interface which allows registering multiple "unified
toolbar" areas for each window.

Use this function in QToolBarLayout::setGeometry()
to register the area for each TopToolBarArea toolbar.

Task-number: QTBUG-36700
Change-Id: I52efcc5662556bb94f25f504be3710d0491f79b9
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
index bf7e85619a..efdd433d8f 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
@@ -136,10 +136,19 @@ private:
     // Request a unified title and toolbar look for the window.
     static void setContentBorderThickness(QWindow *window, int topThickness, int bottomThickness);
 
+    // Request a unified title and toolbar look for the window by registering
+    // an area. Multiple callers can register areas and the platform plugin
+    // will extend the "unified" area to cover them.
+    static void registerContentBorderArea(QWindow *window, quintptr identifer, int upper, int lower);
+
+    // Enable the unified title and toolbar area.
+    static void enableContentBorderArea(QWindow *window, bool enable);
+
     // Sets a NSToolbar instance for the given QWindow. The
     // toolbar will be attached to the native NSWindow when
     // that is created;
    static void setNSToolbar(QWindow *window, void *nsToolbar);
+
 };
 
 QT_END_NAMESPACE