From 1bd710cbc77f71451527b9436c2d8935d8526bd5 Mon Sep 17 00:00:00 2001 From: Teemu Katajisto Date: Fri, 5 Oct 2012 14:20:03 +0300 Subject: [PATCH] Cocoa: don't animate window transitions for 0 width/height windows MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-26617 Change-Id: I6dfc3f208368ddf6be65259218aee88db9692cfe Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qcocoawindow.mm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 4902e31..6e105ee 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -726,6 +726,15 @@ void QCocoaWindow::syncWindowState(Qt::WindowState newState) if (!m_nsWindow) return; + // if content view width or height is 0 then the window animations will crash so + // do nothing except set the new state + NSRect contentRect = [contentView() frame]; + if (contentRect.size.width <= 0 || contentRect.size.height <= 0) { + qWarning() << Q_FUNC_INFO << "invalid window content view size, check your window geometry"; + m_synchedWindowState = newState; + return; + } + if ((m_synchedWindowState & Qt::WindowMaximized) != (newState & Qt::WindowMaximized)) { [m_nsWindow performZoom : m_nsWindow]; // toggles } -- 2.7.4