From 5d2939344eb8fbd3c2115f52a7a8d47365bdf820 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Thu, 8 May 2014 00:50:47 -0400
Subject: [PATCH] Trigger repaint of window when toggling unified toolbar on or
 off.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I5204e5c65ae3cf84459cc62f587ecccd855e02f8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 src/plugins/platforms/cocoa/qcocoawindow.mm | 3 +++
 src/widgets/widgets/qmainwindow.cpp         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 60152b56b20..651fedb26ea 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -1620,6 +1620,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
 
     if (!m_drawContentBorderGradient) {
         [window setStyleMask:[window styleMask] & ~NSTexturedBackgroundWindowMask];
+        [[[window contentView] superview] setNeedsDisplay:YES];
         return;
     }
 
@@ -1650,6 +1651,8 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
 
     [window setContentBorderThickness:effectiveBottomContentBorderThickness forEdge:NSMinYEdge];
     [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge];
+
+    [[[window contentView] superview] setNeedsDisplay:YES];
 }
 
 void QCocoaWindow::updateNSToolbar()
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 90cfb1d7cb3..358569a5e45 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -1519,6 +1519,7 @@ void QMainWindow::setUnifiedTitleAndToolBarOnMac(bool set)
 
         typedef void (*SetContentBorderEnabledFunction)(QWindow *window, bool enable);
         (reinterpret_cast<SetContentBorderEnabledFunction>(function))(window()->windowHandle(), set);
+        update();
     }
 #endif