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

loginDialog: pre-allocate prompt message height

Browse Source 
Right now things jump around if a message comes in.
This commit makes sure there's room for a message to start.

https://bugzilla.gnome.org/show_bug.cgi?id=702308
This commit is contained in:
Ray Strode 2013-06-19 12:56:23 -04:00
parent c9b079cbb5
commit 6e00b6e214
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/gdm/loginDialog.js
View File

@ -506,11 +506,10 @@ const LoginDialog = new Lang.Class({
this._promptEntry.grab_key_focus(); this._promptEntry.grab_key_focus();
this._promptMessage = new St.Label({ visible: false }); this._promptMessage = new St.Label({ opacity: 0 });
this._promptBox.add(this._promptMessage, { x_fill: true }); this._promptBox.add(this._promptMessage, { x_fill: true });
this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' }); this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });
this._promptLoginHint.hide();
this._promptBox.add(this._promptLoginHint); this._promptBox.add(this._promptLoginHint);
this._buttonBox = new St.BoxLayout({ style_class: 'modal-dialog-button-box', this._buttonBox = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
@ -641,7 +640,7 @@ const LoginDialog = new Lang.Class({
this._userVerifier.clear(); this._userVerifier.clear();
this._updateSensitivity(true); this._updateSensitivity(true);
this._promptMessage.hide(); this._promptMessage.opacity = 0;
this._user = null; this._user = null;
this._verifyingUser = false; this._verifyingUser = false;
@ -728,20 +727,19 @@ const LoginDialog = new Lang.Class({
if (message) { if (message) {
this._promptMessage.text = message; this._promptMessage.text = message;
this._promptMessage.styleClass = styleClass; this._promptMessage.styleClass = styleClass;
this._promptMessage.show(); this._promptMessage.opacity = 255;
} else { } else {
this._promptMessage.hide(); this._promptMessage.opacity = 0;
} }
}, },
_showLoginHint: function(verifier, message) { _showLoginHint: function(verifier, message) {
this._promptLoginHint.set_text(message) this._promptLoginHint.set_text(message)
this._promptLoginHint.show();
this._promptLoginHint.opacity = 255; this._promptLoginHint.opacity = 255;
}, },
_hideLoginHint: function() { _hideLoginHint: function() {
this._promptLoginHint.hide(); this._promptLoginHint.opacity = 0;
this._promptLoginHint.set_text(''); this._promptLoginHint.set_text('');
}, },
@ -882,7 +880,7 @@ const LoginDialog = new Lang.Class({
this._setDefaultButtonWellMode(DefaultButtonWellMode.NONE, true); this._setDefaultButtonWellMode(DefaultButtonWellMode.NONE, true);
this._promptBox.hide(); this._promptBox.hide();
this._promptLoginHint.hide(); this._promptLoginHint.opacity = 0;
this._promptUser.set_child(null); this._promptUser.set_child(null);
@ -890,7 +888,7 @@ const LoginDialog = new Lang.Class({
this._promptEntry.set_text(''); this._promptEntry.set_text('');
this._sessionMenuButton.close(); this._sessionMenuButton.close();
this._promptLoginHint.hide(); this._promptLoginHint.opacity = 0;
this._buttonBox.remove_all_children(); this._buttonBox.remove_all_children();
this._signInButton = null; this._signInButton = null;