1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cocoa: Make sure internal minimized state is up to date

Browse Source 
Refactors some code from previous changes addressing the same issue
for maximized and fullscreen states.

Change-Id: I8a27274a90e6610b424ea7af3269369a1d724c48
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-06-04 13:54:07 +02:00 committed by The Qt Project
parent b8c007ede0
commit bfab741cb7
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/cocoa/qnsview.h
View File

@ -81,6 +81,7 @@ QT_END_NAMESPACE
- (void)invalidateWindowShadowIfNeeded; - (void)invalidateWindowShadowIfNeeded;
- (void)drawRect:(NSRect)dirtyRect; - (void)drawRect:(NSRect)dirtyRect;
- (void)updateGeometry; - (void)updateGeometry;
- (void)notifyWindowStateChanged:(Qt::WindowState)newState;
- (void)windowNotification : (NSNotification *) windowNotification; - (void)windowNotification : (NSNotification *) windowNotification;
- (void)notifyWindowWillZoom:(BOOL)willZoom; - (void)notifyWindowWillZoom:(BOOL)willZoom;
- (void)viewDidHide; - (void)viewDidHide;

30
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -251,6 +251,15 @@ static QTouchDevice *touchDevice = 0;
} }
} }
- (void)notifyWindowStateChanged:(Qt::WindowState)newState
{
QWindowSystemInterface::handleWindowStateChanged(m_window, newState);
// We want to read the window state back from the window,
// but the event we just sent may be asynchronous.
QWindowSystemInterface::flushWindowSystemEvents();
m_platformWindow->setSynchedWindowStateFromWindow();
}
- (void)windowNotification : (NSNotification *) windowNotification - (void)windowNotification : (NSNotification *) windowNotification
{ {
//qDebug() << "windowNotification" << QCFString::toQString([windowNotification name]); //qDebug() << "windowNotification" << QCFString::toQString([windowNotification name]);
@ -269,10 +278,11 @@ static QTouchDevice *touchDevice = 0;
if (!m_platformWindow->windowIsPopupType()) if (!m_platformWindow->windowIsPopupType())
QWindowSystemInterface::handleWindowActivated(0); QWindowSystemInterface::handleWindowActivated(0);
} }
} else if (notificationName == NSWindowDidMiniaturizeNotification) { } else if (notificationName == NSWindowDidMiniaturizeNotification
QWindowSystemInterface::handleWindowStateChanged(m_window, Qt::WindowMinimized); || notificationName == NSWindowDidDeminiaturizeNotification) {
} else if (notificationName == NSWindowDidDeminiaturizeNotification) { Qt::WindowState newState = notificationName == NSWindowDidMiniaturizeNotification ?
QWindowSystemInterface::handleWindowStateChanged(m_window, Qt::WindowNoState); Qt::WindowMinimized : Qt::WindowNoState;
[self notifyWindowStateChanged:newState];
} else if ([notificationName isEqualToString: @"NSWindowDidOrderOffScreenNotification"]) { } else if ([notificationName isEqualToString: @"NSWindowDidOrderOffScreenNotification"]) {
m_platformWindow->obscureWindow(); m_platformWindow->obscureWindow();
} else if ([notificationName isEqualToString: @"NSWindowDidOrderOnScreenAndFinishAnimatingNotification"]) { } else if ([notificationName isEqualToString: @"NSWindowDidOrderOnScreenAndFinishAnimatingNotification"]) {
@ -294,11 +304,7 @@ static QTouchDevice *touchDevice = 0;
|| notificationName == NSWindowDidExitFullScreenNotification) { || notificationName == NSWindowDidExitFullScreenNotification) {
Qt::WindowState newState = notificationName == NSWindowDidEnterFullScreenNotification ? Qt::WindowState newState = notificationName == NSWindowDidEnterFullScreenNotification ?
Qt::WindowFullScreen : Qt::WindowNoState; Qt::WindowFullScreen : Qt::WindowNoState;
QWindowSystemInterface::handleWindowStateChanged(m_window, newState); [self notifyWindowStateChanged:newState];
// We want to read the window state back from the window,
// but the event we just sent may be asynchronous.
QWindowSystemInterface::flushWindowSystemEvents();
m_platformWindow->setSynchedWindowStateFromWindow();
} }
} }
#endif #endif
@ -309,11 +315,7 @@ static QTouchDevice *touchDevice = 0;
- (void)notifyWindowWillZoom:(BOOL)willZoom - (void)notifyWindowWillZoom:(BOOL)willZoom
{ {
Qt::WindowState newState = willZoom ? Qt::WindowMaximized : Qt::WindowNoState; Qt::WindowState newState = willZoom ? Qt::WindowMaximized : Qt::WindowNoState;
QWindowSystemInterface::handleWindowStateChanged(m_window, newState); [self notifyWindowStateChanged:newState];
// We want to read the window state back from the window,
// but the event we just sent may be asynchronous.
QWindowSystemInterface::flushWindowSystemEvents();
m_platformWindow->setSynchedWindowStateFromWindow();
} }
- (void)viewDidHide - (void)viewDidHide