sessionMode: Remove lock-screen mode
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:
parent
37c41af1b7
commit
8395f8bad5
@ -826,8 +826,7 @@ StScrollBar {
|
|||||||
font-feature-settings: "tnum";
|
font-feature-settings: "tnum";
|
||||||
|
|
||||||
&.unlock-screen,
|
&.unlock-screen,
|
||||||
&.login-screen,
|
&.login-screen {
|
||||||
&.lock-screen {
|
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -845,7 +844,7 @@ StScrollBar {
|
|||||||
-panel-corner-border-color: lighten($selected_bg_color,5%);
|
-panel-corner-border-color: lighten($selected_bg_color,5%);
|
||||||
}
|
}
|
||||||
|
|
||||||
&.lock-screen, &.login-screen, &.unlock-screen {
|
&.login-screen, &.unlock-screen {
|
||||||
-panel-corner-radius: 0;
|
-panel-corner-radius: 0;
|
||||||
-panel-corner-background-color: transparent;
|
-panel-corner-background-color: transparent;
|
||||||
-panel-corner-border-color: transparent;
|
-panel-corner-border-color: transparent;
|
||||||
@ -879,8 +878,7 @@ StScrollBar {
|
|||||||
|
|
||||||
.system-status-icon { icon-size: 1.09em; padding: 0 5px; }
|
.system-status-icon { icon-size: 1.09em; padding: 0 5px; }
|
||||||
.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%); }
|
||||||
}
|
}
|
||||||
@ -2097,8 +2095,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 transparentize(black,0.6);
|
box-shadow: 0px 2px 4px transparentize(black,0.6);
|
||||||
|
@ -336,9 +336,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();
|
||||||
|
|
||||||
@ -443,9 +440,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) {
|
||||||
@ -510,8 +504,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');
|
||||||
|
|
||||||
@ -579,8 +571,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');
|
||||||
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user