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

main: Remove unused parameters from pushModal()

Browse Source 
Both timestamp and options parameters have been unused since
the switch to Clutter.grab(), so remove them.

Stop using Params.parse(), so that code that still passes the
parameters doesn't throw an error.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3195>
This commit is contained in:
Florian Müllner 2024-02-17 00:43:40 +01:00 committed by Marge Bot
parent 3f72a04a1b
commit 96471b9d19
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/ui/main.js
View File

@ -26,7 +26,6 @@ import * as OsdMonitorLabeler from './osdMonitorLabeler.js';
import * as Overview from './overview.js'; import * as Overview from './overview.js';
import * as PadOsd from './padOsd.js'; import * as PadOsd from './padOsd.js';
import * as Panel from './panel.js'; import * as Panel from './panel.js';
import * as Params from '../misc/params.js';
import * as RunDialog from './runDialog.js'; import * as RunDialog from './runDialog.js';
import * as WelcomeDialog from './welcomeDialog.js'; import * as WelcomeDialog from './welcomeDialog.js';
import * as Layout from './layout.js'; import * as Layout from './layout.js';
@ -659,13 +658,6 @@ function _findModal(grab) {
* which was focused at the time pushModal() was invoked. * which was focused at the time pushModal() was invoked.
* *
* `params` may be used to provide the following parameters: * `params` may be used to provide the following parameters:
* - timestamp: used to associate the call with a specific user initiated
* event. If not provided then the value of
* global.get_current_time() is assumed.
*
* - options: Meta.ModalOptions flags to indicate that the pointer is
* already grabbed
*
* - actionMode: used to set the current Shell.ActionMode to filter * - actionMode: used to set the current Shell.ActionMode to filter
* global keybindings; the default of NONE will filter * global keybindings; the default of NONE will filter
* out all keybindings * out all keybindings
@ -674,12 +666,11 @@ function _findModal(grab) {
* @param {object=} params - optional parameters * @param {object=} params - optional parameters
* @returns {Clutter.Grab} - the grab handle created * @returns {Clutter.Grab} - the grab handle created
*/ */
export function pushModal(actor, params) { export function pushModal(actor, params = {}) {
params = Params.parse(params, { const {actionMode: newActionMode} = {
timestamp: global.get_current_time(),
options: 0,
actionMode: Shell.ActionMode.NONE, actionMode: Shell.ActionMode.NONE,
}); ...params,
};
let grab = global.stage.grab(actor); let grab = global.stage.grab(actor);
@ -713,7 +704,7 @@ export function pushModal(actor, params) {
actionMode, actionMode,
}); });
actionMode = params.actionMode; actionMode = newActionMode;
global.stage.set_key_focus(actor); global.stage.set_key_focus(actor);
return grab; return grab;
} }