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

unlockDialog: Transition switch-user button with prompt

Browse Source 
We ended up always showing the switch-user button on the lock screen,
as showing and hiding it with the prompt was too visually distracting.

But now that we have a fancy transition in place, we can easily extend
it to the switch-user button as well.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1029
This commit is contained in:
Florian Müllner 2020-02-19 14:30:05 +01:00 committed by Florian Müllner
parent c6cf81f28b
commit ff2a736193
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/unlockDialog.js
View File

@ -556,12 +556,13 @@ var UnlockDialog = GObject.registerClass({
this._otherUserButton = new St.Button({ this._otherUserButton = new St.Button({
style_class: 'modal-dialog-button button switch-user-button', style_class: 'modal-dialog-button button switch-user-button',
accessible_name: _('Log in as another user'), accessible_name: _('Log in as another user'),
can_focus: true, reactive: false,
reactive: true, opacity: 0,
x_align: Clutter.ActorAlign.END, x_align: Clutter.ActorAlign.END,
y_align: Clutter.ActorAlign.END, y_align: Clutter.ActorAlign.END,
child: new St.Icon({ icon_name: 'system-users-symbolic' }), child: new St.Icon({ icon_name: 'system-users-symbolic' }),
}); });
this._otherUserButton.set_pivot_point(0.5, 0.5);
this._otherUserButton.connect('clicked', this._otherUserClicked.bind(this)); this._otherUserButton.connect('clicked', this._otherUserClicked.bind(this));
let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' }); let screenSaverSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.screensaver' });
@ -713,6 +714,11 @@ var UnlockDialog = GObject.registerClass({
this._promptBox.visible = progress > 0; this._promptBox.visible = progress > 0;
this._clock.visible = progress < 1; this._clock.visible = progress < 1;
this._otherUserButton.set({
reactive: progress > 0,
can_focus: progress > 0,
});
const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage); const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage);
this._promptBox.set({ this._promptBox.set({
@ -728,6 +734,12 @@ var UnlockDialog = GObject.registerClass({
scale_y: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * (1 - progress), scale_y: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * (1 - progress),
translation_y: -FADE_OUT_TRANSLATION * progress * scaleFactor, translation_y: -FADE_OUT_TRANSLATION * progress * scaleFactor,
}); });
this._otherUserButton.set({
opacity: 255 * progress,
scale_x: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * progress,
scale_y: FADE_OUT_SCALE + (1 - FADE_OUT_SCALE) * progress,
});
} }
_fail() { _fail() {