Bug 1238536 part 2 - Do not trigger fullscreen changed when switching between fullscreen and minimized. r=karlt

--HG--
extra : source : b110bdb2afcc02f8a59a4398dee20825f7cc0fd0
This commit is contained in:
Xidorn Quan 2016-01-20 09:56:52 +11:00
parent 7757d924da
commit 31969e33ee

View File

@ -3296,7 +3296,6 @@ nsWindow::OnWindowStateEvent(GtkWidget *aWidget, GdkEventWindowState *aEvent)
return;
}
bool wasInFullscreen = mSizeState == nsSizeMode_Fullscreen;
if (aEvent->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
LOG(("\tIconified\n"));
mSizeState = nsSizeMode_Minimized;
@ -3325,10 +3324,9 @@ nsWindow::OnWindowStateEvent(GtkWidget *aWidget, GdkEventWindowState *aEvent)
if (mWidgetListener) {
mWidgetListener->SizeModeChanged(mSizeState);
bool isInFullscreen = mSizeState == nsSizeMode_Fullscreen;
if (isInFullscreen != wasInFullscreen) {
mWidgetListener->FullscreenChanged(isInFullscreen);
if (aEvent->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) {
mWidgetListener->FullscreenChanged(
aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN);
}
}
}