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

authPrompt: Hide cancel button on unlock screen

Browse Source 
As per the latest design review, hide the cancel button
on the unlock dialog.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1006
This commit is contained in:
Georges Basile Stavracas Neto 2020-02-14 13:14:55 -03:00 committed by Florian Müllner
parent 133b623204
commit 5cad5c20e9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/gdm/authPrompt.js
View File

@ -81,6 +81,8 @@ var AuthPrompt = GObject.registerClass({
}); });
this.add_child(this._userWell); this.add_child(this._userWell);
this._hasCancelButton = this._mode === AuthPromptStatus.UNLOCK_OR_LOG_IN;
this._initEntryRow(); this._initEntryRow();
this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({ this._capsLockWarningLabel = new ShellEntry.CapsLockWarning({
@ -123,13 +125,16 @@ var AuthPrompt = GObject.registerClass({
this.cancelButton = new St.Button({ this.cancelButton = new St.Button({
style_class: 'modal-dialog-button button cancel-button', style_class: 'modal-dialog-button button cancel-button',
button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE, button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
reactive: true, reactive: this._hasCancelButton,
can_focus: true, can_focus: true,
x_align: Clutter.ActorAlign.START, x_align: Clutter.ActorAlign.START,
y_align: Clutter.ActorAlign.CENTER, y_align: Clutter.ActorAlign.CENTER,
child: new St.Icon({ icon_name: 'go-previous-symbolic' }), child: new St.Icon({ icon_name: 'go-previous-symbolic' }),
}); });
this.cancelButton.connect('clicked', () => this.cancel()); if (this._hasCancelButton)
this.cancelButton.connect('clicked', () => this.cancel());
else
this.cancelButton.opacity = 0;
this._mainBox.add_child(this.cancelButton); this._mainBox.add_child(this.cancelButton);
let entryParams = { let entryParams = {
@ -433,7 +438,7 @@ var AuthPrompt = GObject.registerClass({
reset() { reset() {
let oldStatus = this.verificationStatus; let oldStatus = this.verificationStatus;
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING; this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
this.cancelButton.reactive = true; this.cancelButton.reactive = this._hasCancelButton;
this._preemptiveAnswer = null; this._preemptiveAnswer = null;
if (this._userVerifier) if (this._userVerifier)