Cocoa: Update unified toolbar area on toolbar hide

Add setContentBorderAreaEnabled() which us used to
enable or disable an area. Used together with
registerContentBorderArea() this allows changing the
border area geometry and enabled status independently.

Add section to the QToolBar show/hide event handler
which calls setContentBorderAreaEnabled().

Make sure QToolBar and QToolBarLayout uses the same
identifier - the QToolBar object pointer.

Rename enableContentBorderArea -> setContentBorderEnabled.
The "ContentBorder" is now the entire unified toolbar
area while "ContentBorderArea"s are the sub-areas
covered by toolbars.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index b7a6a14d4a..d8eb0ed0bd 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -211,7 +211,8 @@ public:
     void registerTouch(bool enable);
     void setContentBorderThickness(int topThickness, int bottomThickness);
     void registerContentBorderArea(quintptr identifier, int upper, int lower);
-    void enableContentBorderArea(bool enable);
+    void setContentBorderAreaEnabled(quintptr identifier, bool enable);
+    void setContentBorderEnabled(bool enable);
     void applyContentBorderThickness(NSWindow *window);
     void updateNSToolbar();
 
@@ -289,7 +290,8 @@ public: // for QNSView
     NSApplicationPresentationOptions m_presentationOptions;
 
     struct BorderRange {
-        BorderRange(int u, int l) : upper(u), lower(l) { }
+        BorderRange(quintptr i, int u, int l) : identifier(i), upper(u), lower(l) { }
+        quintptr identifier;
         int upper;
         int lower;
         bool operator<(BorderRange const& right) const {
@@ -297,6 +299,7 @@ public: // for QNSView
         }
     };
     QHash<quintptr, BorderRange> m_contentBorderAreas; // identifer -> uppper/lower
+    QHash<quintptr, bool> m_enabledContentBorderAreas; // identifer -> enabled state (true/false)
 };
 
 QT_END_NAMESPACE