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

system: Remove rogue separator in lock screen

Browse Source 
Hide the actions box when none are showing.

https://bugzilla.gnome.org/show_bug.cgi?id=705845
This commit is contained in:
Jasper St. Pierre 2013-08-12 13:08:53 -04:00
parent 3e4d0954b5
commit 52ec5cf8e7
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/status/system.js
View File

@ -113,11 +113,21 @@ const Indicator = new Lang.Class({
this._sessionUpdated(); this._sessionUpdated();
}, },
_updateActionsVisibility: function() {
let visible = (this._settingsAction.visible ||
this._orientationLockAction.visible ||
this._lockScreenAction.visible ||
this._powerOffAction.visible);
this._actionsItem.actor.visible = visible;
},
_sessionUpdated: function() { _sessionUpdated: function() {
this._updateLockScreen(); this._updateLockScreen();
this._updatePowerOff(); this._updatePowerOff();
this._updateMultiUser(); this._updateMultiUser();
this._settingsAction.visible = Main.sessionMode.allowSettings; this._settingsAction.visible = Main.sessionMode.allowSettings;
this._updateActionsVisibility();
}, },
_updateMultiUser: function() { _updateMultiUser: function() {
@ -183,12 +193,15 @@ const Indicator = new Lang.Class({
let locked = this._orientationSettings.get_boolean('orientation-lock'); let locked = this._orientationSettings.get_boolean('orientation-lock');
let icon = this._orientationLockAction.child; let icon = this._orientationLockAction.child;
icon.icon_name = locked ? 'rotation-locked-symbolic' : 'rotation-allowed-symbolic'; icon.icon_name = locked ? 'rotation-locked-symbolic' : 'rotation-allowed-symbolic';
this._updateActionsVisibility();
}, },
_updateLockScreen: function() { _updateLockScreen: function() {
let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY); let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
this._lockScreenAction.visible = showLock && allowLockScreen && LoginManager.canLock(); this._lockScreenAction.visible = showLock && allowLockScreen && LoginManager.canLock();
this._updateActionsVisibility();
}, },
_updateHaveShutdown: function() { _updateHaveShutdown: function() {
@ -203,6 +216,7 @@ const Indicator = new Lang.Class({
_updatePowerOff: function() { _updatePowerOff: function() {
this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked; this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked;
this._updateActionsVisibility();
}, },
_createActionButton: function(iconName, accessibleName) { _createActionButton: function(iconName, accessibleName) {
@ -269,6 +283,7 @@ const Indicator = new Lang.Class({
can_focus: false }); can_focus: false });
item.addActor(hbox, { expand: true }); item.addActor(hbox, { expand: true });
this._actionsItem = item;
this.menu.addMenuItem(item); this.menu.addMenuItem(item);
}, },