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

modalDialog: Stop passing timestamp to Main.pushModal()

Browse Source 
Since the move to Clutter.grab() in commit f4cae72d17af6, the
parameter doesn't do anything anymore.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3195>
This commit is contained in:
Florian Müllner 2024-02-16 23:58:12 +01:00 committed by Marge Bot
parent 0432623fc8
commit 3574c5246a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/modalDialog.js
View File

@ -178,7 +178,7 @@ export const ModalDialog = GObject.registerClass({
if (this.state === State.OPENED || this.state === State.OPENING) if (this.state === State.OPENED || this.state === State.OPENING)
return true; return true;
if (!this.pushModal(timestamp)) if (!this.pushModal())
return false; return false;
this._fadeOpen(onPrimary); this._fadeOpen(onPrimary);
@ -234,14 +234,11 @@ export const ModalDialog = GObject.registerClass({
this.backgroundStack.set_child_above_sibling(this._eventBlocker, null); this.backgroundStack.set_child_above_sibling(this._eventBlocker, null);
} }
pushModal(timestamp) { pushModal() {
if (this._hasModal) if (this._hasModal)
return true; return true;
let params = {actionMode: this._actionMode}; const grab = Main.pushModal(this, {actionMode: this._actionMode});
if (timestamp)
params['timestamp'] = timestamp;
let grab = Main.pushModal(this, params);
if (grab.get_seat_state() !== Clutter.GrabState.ALL) { if (grab.get_seat_state() !== Clutter.GrabState.ALL) {
Main.popModal(grab); Main.popModal(grab);
return false; return false;