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

unlockDialog: Show unlock hint on inactivity

Browse Source 
Inactivity on the unlock screen can be an indication that the user
doesn't know how to get to the auth prompt. Fade in a small hint
that points them in the right direction.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/972
This commit is contained in:
Florian Müllner 2020-02-11 19:35:22 +01:00 committed by Georges Basile Stavracas Neto
parent d43401cc74
commit e57768e2e8
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/theme/gnome-shell-sass/widgets/_screen-shield.scss
View File

@ -4,12 +4,12 @@
color: white; color: white;
font-weight: 300; font-weight: 300;
text-align: center; text-align: center;
spacing: 24px;
padding-bottom: 2.5em; padding-bottom: 2.5em;
} }
.unlock-dialog-clock-time { .unlock-dialog-clock-time {
font-size: 64pt; font-size: 64pt;
padding-bottom: 24px;
padding-top: 42px; padding-top: 42px;
font-feature-settings: "tnum"; font-feature-settings: "tnum";
} }
@ -19,6 +19,11 @@
font-weight: normal; font-weight: normal;
} }
.unlock-dialog-clock-hint {
font-weight: normal;
padding-top: 48px;
}
.unlock-dialog-notifications-container { .unlock-dialog-notifications-container {
margin: 12px 0; margin: 12px 0;
spacing: 6px; spacing: 6px;

36
js/ui/unlockDialog.js
View File

@ -15,6 +15,9 @@ const AuthPrompt = imports.gdm.authPrompt;
// The timeout before going back automatically to the lock screen (in seconds) // The timeout before going back automatically to the lock screen (in seconds)
const IDLE_TIMEOUT = 2 * 60; const IDLE_TIMEOUT = 2 * 60;
// The timeout before showing the unlock hint (in seconds)
const HINT_TIMEOUT = 4;
const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver'; const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
const CROSSFADE_TIME = 300; const CROSSFADE_TIME = 300;
@ -323,14 +326,37 @@ class UnlockDialogClock extends St.BoxLayout {
style_class: 'unlock-dialog-clock-date', style_class: 'unlock-dialog-clock-date',
x_align: Clutter.ActorAlign.CENTER, x_align: Clutter.ActorAlign.CENTER,
}); });
this._hint = new St.Label({
style_class: 'unlock-dialog-clock-hint',
x_align: Clutter.ActorAlign.CENTER,
opacity: 0,
});
this.add_child(this._time); this.add_child(this._time);
this.add_child(this._date); this.add_child(this._date);
this.add_child(this._hint);
this._wallClock = new GnomeDesktop.WallClock({ time_only: true }); this._wallClock = new GnomeDesktop.WallClock({ time_only: true });
this._wallClock.connect('notify::clock', this._updateClock.bind(this)); this._wallClock.connect('notify::clock', this._updateClock.bind(this));
this._seat = Clutter.get_default_backend().get_default_seat();
this._touchModeChangedId = this._seat.connect('notify::touch-mode',
this._updateHint.bind(this));
this._monitorManager = Meta.MonitorManager.get();
this._powerModeChangedId = this._monitorManager.connect(
'power-save-mode-changed', () => (this._hint.opacity = 0));
this._idleMonitor = Meta.IdleMonitor.get_core();
this._idleWatchId = this._idleMonitor.add_idle_watch(HINT_TIMEOUT * 1000, () => {
this._hint.ease({
opacity: 255,
duration: CROSSFADE_TIME,
});
});
this._updateClock(); this._updateClock();
this._updateHint();
this.connect('destroy', this._onDestroy.bind(this)); this.connect('destroy', this._onDestroy.bind(this));
} }
@ -345,8 +371,18 @@ class UnlockDialogClock extends St.BoxLayout {
this._date.text = date.toLocaleFormat(dateFormat); this._date.text = date.toLocaleFormat(dateFormat);
} }
_updateHint() {
this._hint.text = this._seat.touch_mode
? _('Swipe up to unlock')
: _('Click or press a key to unlock');
}
_onDestroy() { _onDestroy() {
this._wallClock.run_dispose(); this._wallClock.run_dispose();
this._seat.disconnect(this._touchModeChangedId);
this._idleMonitor.remove_watch(this._idleWatchId);
this._monitorManager.disconnect(this._powerModeChangedId);
} }
}); });