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

sessionMode: Remove lock-screen mode

Browse Source 
Now that the screen shield is gone (at least, as it used to
be), the corresponding session mode is not necessary anymore
as well.

Remove the 'lock-screen' session mode, and the corresponding
CSS.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
This commit is contained in:
Georges Basile Stavracas Neto 2019-11-29 12:43:18 -03:00 committed by Florian Müllner
parent 16dcb1ac15
commit c20451c2e7
4 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/theme/gnome-shell-sass/widgets/_panel.scss
View File

@ -15,8 +15,7 @@ $panel_height: 1.86em;
// transparent panel on lock & login screens // transparent panel on lock & login screens
&.unlock-screen, &.unlock-screen,
&.login-screen, &.login-screen {
&.lock-screen {
background-color: transparent; background-color: transparent;
.panel-corner { .panel-corner {
@ -77,8 +76,7 @@ $panel_height: 1.86em;
// lock & login screen styles // lock & login screen styles
.unlock-screen &, .unlock-screen &,
.login-screen &, .login-screen & {
.lock-screen & {
color: lighten($fg_color, 10%); color: lighten($fg_color, 10%);
&:focus, &:hover, &:active { color: lighten($fg_color, 10%); } &:focus, &:hover, &:active { color: lighten($fg_color, 10%); }
} }

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

@ -50,8 +50,6 @@ $_unlockdialog_shadow: 0px 0px 6px rgba(0, 0, 0, 0.726);
.unlock-dialog-notification-count-text { padding: 0px 0px 0px 12px; } .unlock-dialog-notification-count-text { padding: 0px 0px 0px 12px; }
#panel.lock-screen { background-color: transparentize($osd_bg_color, 0.5); }
.screen-shield-background { //just the shadow, really .screen-shield-background { //just the shadow, really
background: black; background: black;
box-shadow: 0px 2px 4px rgba(0,0,0,0.6); box-shadow: 0px 2px 4px rgba(0,0,0,0.6);

11
js/ui/screenShield.js
View File

@ -362,9 +362,6 @@ var ScreenShield = class {
} }
_hideLockScreenComplete() { _hideLockScreenComplete() {
if (Main.sessionMode.currentMode == 'lock-screen')
Main.sessionMode.popMode('lock-screen');
this._lockScreenState = MessageTray.State.HIDDEN; this._lockScreenState = MessageTray.State.HIDDEN;
this._lockScreenGroup.hide(); this._lockScreenGroup.hide();
@ -470,9 +467,6 @@ var ScreenShield = class {
} }
this._lockScreenGroup.grab_key_focus(); this._lockScreenGroup.grab_key_focus();
if (Main.sessionMode.currentMode != 'lock-screen')
Main.sessionMode.pushMode('lock-screen');
} }
_lockScreenShown(params) { _lockScreenShown(params) {
@ -536,8 +530,6 @@ var ScreenShield = class {
_continueDeactivate(animate) { _continueDeactivate(animate) {
this._hideLockScreen(animate); this._hideLockScreen(animate);
if (Main.sessionMode.currentMode == 'lock-screen')
Main.sessionMode.popMode('lock-screen');
if (Main.sessionMode.currentMode == 'unlock-dialog') if (Main.sessionMode.currentMode == 'unlock-dialog')
Main.sessionMode.popMode('unlock-dialog'); Main.sessionMode.popMode('unlock-dialog');
@ -605,8 +597,7 @@ var ScreenShield = class {
this.actor.show(); this.actor.show();
if (Main.sessionMode.currentMode != 'unlock-dialog' && if (Main.sessionMode.currentMode !== 'unlock-dialog') {
Main.sessionMode.currentMode != 'lock-screen') {
this._isGreeter = Main.sessionMode.isGreeter; this._isGreeter = Main.sessionMode.isGreeter;
if (!this._isGreeter) if (!this._isGreeter)
Main.sessionMode.pushMode('unlock-dialog'); Main.sessionMode.pushMode('unlock-dialog');

13
js/ui/sessionMode.js
View File

@ -53,19 +53,6 @@ const _modes = {
panelStyle: 'login-screen', panelStyle: 'login-screen',
}, },
'lock-screen': {
isLocked: true,
isGreeter: undefined,
unlockDialog: undefined,
components: ['polkitAgent', 'telepathyClient'],
panel: {
left: [],
center: [],
right: ['aggregateMenu'],
},
panelStyle: 'lock-screen',
},
'unlock-dialog': { 'unlock-dialog': {
isLocked: true, isLocked: true,
unlockDialog: undefined, unlockDialog: undefined,