Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 290862. Use gtk modal window apis instead of grabs. patch by Matthew Gregan, r=karlt,sr=roc,a=pavlov

Browse Source
This commit is contained in:
roc+@cs.cmu.edu 2007-10-09 13:58:24 -07:00
parent 292a9a31a8
commit 4229891892
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widget/src/gtk2/nsWindow.cpp
View File

@ -524,7 +524,7 @@ nsWindow::SetModal(PRBool aModal)
{
LOG(("nsWindow::SetModal [%p] %d\n", (void *)this, aModal));
// find the toplevel window and add it to the grab list
// find the toplevel window and set its modality
GtkWidget *grabWidget = nsnull;
GetToplevelWidget(&grabWidget);
@ -532,10 +532,20 @@ nsWindow::SetModal(PRBool aModal)
if (!grabWidget)
return NS_ERROR_FAILURE;
// block focus tracking via gFocusWindow internally in case the window
// manager does not block focus to parents of modal windows
if (mTransientParent) {
GtkWidget *transientWidget = GTK_WIDGET(mTransientParent);
nsRefPtr<nsWindow> parent = get_window_for_gtk_widget(transientWidget);
if (!parent)
return NS_ERROR_FAILURE;
parent->mContainerBlockFocus = aModal;
}
if (aModal)
gtk_grab_add(grabWidget);
gtk_window_set_modal(GTK_WINDOW(grabWidget), TRUE);
else
gtk_grab_remove(grabWidget);
gtk_window_set_modal(GTK_WINDOW(grabWidget), FALSE);
return NS_OK;
}