Bug 526282 - Minimize button disabled after full screen mode on Mac OS 10.6. r=josh

This commit is contained in:
Markus Stange 2010-01-13 17:17:57 +01:00
Родитель 924da65299
Коммит f68d649d95
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -1072,12 +1072,14 @@ NS_METHOD nsCocoaWindow::MakeFullScreen(PRBool aFullScreen)
NS_ASSERTION(mFullScreen != aFullScreen, "Unnecessary MakeFullScreen call");
NSDisableScreenUpdates();
// The order here matters. When we exit full screen mode, we need to show the
// Dock first, otherwise the newly-created window won't have its minimize
// button enabled. See bug 526282.
nsCocoaUtils::HideOSChromeOnScreen(aFullScreen, [mWindow screen]);
nsresult rv = nsBaseWidget::MakeFullScreen(aFullScreen);
NSEnableScreenUpdates();
NS_ENSURE_SUCCESS(rv, rv);
nsCocoaUtils::HideOSChromeOnScreen(aFullScreen, [mWindow screen]);
mFullScreen = aFullScreen;
return NS_OK;