From 8eb0782f25ad2f67230b0c2e33636fa5c8e567d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 6 Mar 2015 16:56:11 +0100 Subject: [PATCH] loginDialog: Pass-through UserWidget's label-actor https://bugzilla.gnome.org/show_bug.cgi?id=729603 --- js/gdm/loginDialog.js | 4 ++++ js/ui/userWidget.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js index b5a5c56e5..ce569bfdb 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js @@ -22,6 +22,7 @@ const Clutter = imports.gi.Clutter; const Gdm = imports.gi.Gdm; const Gio = imports.gi.Gio; const GLib = imports.gi.GLib; +const GObject = imports.gi.GObject; const Gtk = imports.gi.Gtk; const Lang = imports.lang; const Mainloop = imports.mainloop; @@ -71,6 +72,9 @@ const UserListItem = new Lang.Class({ this._userWidget = new UserWidget.UserWidget(this.user); layout.add(this._userWidget.actor); + this._userWidget.actor.bind_property('label-actor', this.actor, 'label-actor', + GObject.BindingFlags.SYNC_CREATE); + this._timedLoginIndicator = new St.Bin({ style_class: 'login-dialog-timed-login-indicator', scale_x: 0 }); layout.add(this._timedLoginIndicator); diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js index 314aae0ce..5286ad14e 100644 --- a/js/ui/userWidget.js +++ b/js/ui/userWidget.js @@ -6,6 +6,7 @@ const Clutter = imports.gi.Clutter; const AccountsService = imports.gi.AccountsService; const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; +const GObject = imports.gi.GObject; const Lang = imports.lang; const St = imports.gi.St; @@ -117,6 +118,7 @@ const UserWidgetLabel = new Lang.Class({ this._currentLabel = this._realNameLabel; else this._currentLabel = this._userNameLabel; + this.label_actor = this._currentLabel; let childBox = new Clutter.ActorBox(); childBox.x1 = 0; @@ -158,6 +160,9 @@ const UserWidget = new Lang.Class({ this._label = new UserWidgetLabel(user); this.actor.add_child(this._label); + this._label.bind_property('label-actor', this.actor, 'label-actor', + GObject.BindingFlags.SYNC_CREATE); + this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUser)); this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUser)); this._updateUser();