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

modalDialog: Remove onPrimary parameter

Browse Source 
It was added in commit 48fb16b570 for the lock screen, but that
hasn't been based on ModalDialog for a long time.

It doesn't appear that anything else ever used the parameter,
so just remove it.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3195>
This commit is contained in:
Florian Müllner 2024-02-17 00:20:46 +01:00 committed by Marge Bot
parent a17f4a6cb8
commit 0ae285cc82
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/modalDialog.js
View File

@ -141,11 +141,8 @@ export const ModalDialog = GObject.registerClass({
return this.dialogLayout.addButton(buttonInfo); return this.dialogLayout.addButton(buttonInfo);
} }
_fadeOpen(onPrimary) { _fadeOpen() {
if (onPrimary) this._monitorConstraint.index = global.display.get_current_monitor();
this._monitorConstraint.primary = true;
else
this._monitorConstraint.index = global.display.get_current_monitor();
this._setState(State.OPENING); this._setState(State.OPENING);
@ -174,14 +171,14 @@ export const ModalDialog = GObject.registerClass({
() => (this._initialKeyFocus = null), this); () => (this._initialKeyFocus = null), this);
} }
open(timestamp, onPrimary) { open(_timestamp) {
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()) if (!this.pushModal())
return false; return false;
this._fadeOpen(onPrimary); this._fadeOpen();
return true; return true;
} }