[gnome-control-center] user-account: Use a stack in user-icon to keep the same size
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-account: Use a stack in user-icon to keep the same size
- Date: Mon, 13 Feb 2017 10:57:04 +0000 (UTC)
commit 92e99f677fcfe6b56d9f324a11f4f7fbf999523c
Author: Felipe Borges <felipeborges gnome org>
Date: Sun Feb 12 14:51:50 2017 +0100
user-account: Use a stack in user-icon to keep the same size
This fixes the undesired jumps (resizes) while switching between
"Your Account" and any other account.
https://bugzilla.gnome.org/show_bug.cgi?id=778458
panels/user-accounts/data/user-accounts-dialog.ui | 13 +------------
panels/user-accounts/um-user-panel.c | 8 ++++----
2 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/panels/user-accounts/data/user-accounts-dialog.ui
b/panels/user-accounts/data/user-accounts-dialog.ui
index 0b88b9c..5507d05 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -291,9 +291,8 @@
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkStack" id="user-icon">
<property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
<property name="halign">GTK_ALIGN_END</property>
<child>
<object class="UmUserImage" id="user-icon-image">
@@ -307,11 +306,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
<child>
<object class="GtkToggleButton" id="user-icon-button">
@@ -332,11 +326,6 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index f1bba72..0a88a45 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1269,8 +1269,8 @@ on_permission_changed (GPermission *permission,
}
if (is_authorized || self_selected) {
- gtk_widget_show (get_widget (d, "user-icon-button"));
- gtk_widget_hide (get_widget (d, "user-icon-image"));
+ gtk_stack_set_visible_child (GTK_STACK (get_widget (d, "user-icon")),
+ get_widget (d, "user-icon-button"));
gtk_widget_set_sensitive (get_widget (d, "account-language-button"), TRUE);
remove_unlock_tooltip (get_widget (d, "account-language-button"));
@@ -1285,8 +1285,8 @@ on_permission_changed (GPermission *permission,
remove_unlock_tooltip (get_widget (d, "last-login-button"));
}
else {
- gtk_widget_hide (get_widget (d, "user-icon-button"));
- gtk_widget_show (get_widget (d, "user-icon-image"));
+ gtk_stack_set_visible_child (GTK_STACK (get_widget (d, "user-icon")),
+ get_widget (d, "user-icon-image"));
gtk_widget_set_sensitive (get_widget (d, "account-language-button"), FALSE);
add_unlock_tooltip (get_widget (d, "account-language-button"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]