wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 700277, nsWindow::BringToFront doesn't handle first opened window properly, r=blassey

Browse Source
This commit is contained in:
Neil Deakin 2011-11-08 14:58:37 -05:00
parent 9b07d18fe2
commit 0cbcee0374
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/android/nsWindow.cpp
View File

@ -53,6 +53,7 @@ using mozilla::unused;
#include "nsIdleService.h"
#include "nsWindow.h"
#include "nsIObserverService.h"
#include "nsFocusManager.h"
#include "nsRenderingContext.h"
#include "nsIDOMSimpleGestureEvent.h"
@ -555,7 +556,14 @@ nsWindow::SetFocus(bool aRaise)
void
nsWindow::BringToFront()
{
if (FindTopLevel() == TopWindow())
// If the window to be raised is the same as the currently raised one,
// do nothing. We need to check the focus manager as well, as the first
// window that is created will be first in the window list but won't yet
// be focused.
nsCOMPtr<nsIFocusManager> fm = do_GetService(FOCUSMANAGER_CONTRACTID);
nsCOMPtr<nsIDOMWindow> existingTopWindow;
fm->GetActiveWindow(getter_AddRefs(existingTopWindow));
if (existingTopWindow && FindTopLevel() == TopWindow())
return;
if (!IsTopLevel()) {