brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closeDialog: Actually set key focus to button when grabbing key focus

Browse Source 
When setting the key focus to `this._dialog`, the default button is not
automatically focused and no button has key focus.

Use the `initialKeyFocus` property of the dialog instead, and set focus
to the default button if the dialog is not already focused.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/786>
This commit is contained in:
Jonas Dreßler 2019-10-27 18:58:16 +01:00 committed by Florian Müllner
parent d373e10a44
commit de834fe307
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/ui/closeDialog.js
View File

@ -208,7 +208,11 @@ export const CloseDialog = GObject.registerClass({
} }
vfunc_focus() { vfunc_focus() {
if (this._dialog) if (!this._dialog)
this._dialog.grab_key_focus(); return;
const keyFocus = global.stage.key_focus;
if (!keyFocus || !this._dialog.contains(keyFocus))
this._dialog.initialKeyFocus.grab_key_focus();
} }
}); });