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

loginDialog: Use the same prompt layout as the unlock dialog

Browse Source 
Currently the layout of the password prompt differs slightly between
login dialog and unlock screen - for the former, the prompt is
displayed next to the user avatar, replacing the user name, for
the latter, it is diplayed below both avatar and name.

https://bugzilla.gnome.org/show_bug.cgi?id=685201
This commit is contained in:
Florian Müllner 2012-10-04 18:31:50 +02:00
parent 5bfcc5392d
commit 05f5fac35b
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/theme/gnome-shell.css
View File

@ -2033,7 +2033,6 @@ StScrollBar StButton#vhandle:active {
} }
.login-dialog-user-list-item { .login-dialog-user-list-item {
color: #666666;
border-radius: 10px; border-radius: 10px;
padding: .2em; padding: .2em;
} }
@ -2051,6 +2050,11 @@ StScrollBar StButton#vhandle:active {
padding-left: 1em; padding-left: 1em;
} }
.login-dialog-user-list:expanded .login-dialog-user-list-item {
color: #666666;
}
.login-dialog-user-list-item,
.login-dialog-user-list-item:hover .login-dialog-user-list-item-name, .login-dialog-user-list-item:hover .login-dialog-user-list-item-name,
.login-dialog-user-list:expanded .login-dialog-user-list-item:focus .login-dialog-user-list-item-name, .login-dialog-user-list:expanded .login-dialog-user-list-item:focus .login-dialog-user-list-item-name,
.login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in { .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {

34
js/gdm/loginDialog.js
View File

@ -220,10 +220,6 @@ const UserList = new Lang.Class({
_showItem: function(item) { _showItem: function(item) {
let tasks = [function() { let tasks = [function() {
return GdmUtil.fadeInActor(item.actor); return GdmUtil.fadeInActor(item.actor);
},
function() {
return item.fadeInName();
}]; }];
let batch = new Batch.ConsecutiveBatch(this, tasks); let batch = new Batch.ConsecutiveBatch(this, tasks);
@ -686,31 +682,23 @@ const LoginDialog = new Lang.Class({
{ y_fill: false, { y_fill: false,
y_align: St.Align.START }); y_align: St.Align.START });
let mainContentBox = new St.BoxLayout({ vertical: false }); this._userList = new UserList();
this.contentLayout.add(mainContentBox, this.contentLayout.add(this._userList.actor,
{ expand: true, { expand: true,
x_fill: true, x_fill: true,
y_fill: false }); y_fill: true });
this._userList = new UserList();
mainContentBox.add(this._userList.actor,
{ expand: true,
x_fill: true,
y_fill: true });
this.setInitialKeyFocus(this._userList.actor); this.setInitialKeyFocus(this._userList.actor);
this._promptBox = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout', this._promptBox = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
vertical: true }); vertical: true });
mainContentBox.add(this._promptBox, this.contentLayout.add(this._promptBox,
{ expand: true, { expand: true,
x_fill: true, x_fill: true,
y_fill: true, y_fill: true,
x_align: St.Align.START }); x_align: St.Align.START });
this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' }); this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
this._mainContentBox = mainContentBox;
this._promptBox.add(this._promptLabel, this._promptBox.add(this._promptLabel,
{ expand: true, { expand: true,
x_fill: true, x_fill: true,
@ -1170,10 +1158,6 @@ const LoginDialog = new Lang.Class({
return this._userList.giveUpWhitespace(); return this._userList.giveUpWhitespace();
}, },
function() {
return activatedItem.fadeOutName();
},
new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel, new Batch.ConcurrentBatch(this, [this._fadeOutTitleLabel,
this._fadeOutNotListedButton, this._fadeOutNotListedButton,
this._fadeOutLogo]), this._fadeOutLogo]),
@ -1229,7 +1213,7 @@ const LoginDialog = new Lang.Class({
}, },
_onOpened: function() { _onOpened: function() {
Main.ctrlAltTabManager.addGroup(this._mainContentBox, Main.ctrlAltTabManager.addGroup(this.contentLayout,
_("Login Window"), _("Login Window"),
'dialog-password', 'dialog-password',
{ sortGroup: CtrlAltTab.SortGroup.MIDDLE }); { sortGroup: CtrlAltTab.SortGroup.MIDDLE });