[gnome-control-center] user-accounts: Don't move with arrow during animations
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: Don't move with arrow during animations
- Date: Mon, 13 Feb 2017 11:08:29 +0000 (UTC)
commit c8b535007f2c67f3ac63de49aebacb40e05ce8ba
Author: Ondrej Holy <oholy redhat com>
Date: Fri Feb 10 15:52:43 2017 +0100
user-accounts: Don't move with arrow during animations
Don't move with the arrow during the stack animation in order to avoid
some ugly movements...
https://bugzilla.gnome.org/show_bug.cgi?id=778405
panels/user-accounts/um-carousel.c | 38 +++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/panels/user-accounts/um-carousel.c b/panels/user-accounts/um-carousel.c
index 6dc115f..f7d0a26 100644
--- a/panels/user-accounts/um-carousel.c
+++ b/panels/user-accounts/um-carousel.c
@@ -192,14 +192,7 @@ on_item_toggled (UmCarouselItem *item,
{
UmCarousel *self = UM_CAROUSEL (user_data);
- if (self->selected_item != NULL)
- self->arrow_start_x = um_carousel_item_get_x (self->selected_item, self);
-
- self->selected_item = item;
-
- g_signal_emit (user_data, signals[ITEM_ACTIVATED], 0, item);
-
- um_carousel_move_arrow (self);
+ um_carousel_select_item (self, item);
}
void
@@ -207,16 +200,32 @@ um_carousel_select_item (UmCarousel *self,
UmCarouselItem *item)
{
gchar *page_name;
+ gboolean page_changed = TRUE;
- on_item_toggled (item, NULL, self);
+ if (self->selected_item != NULL)
+ {
+ page_changed = (self->selected_item->page != item->page);
+ self->arrow_start_x = um_carousel_item_get_x (self->selected_item, self);
+ }
+ self->selected_item = item;
self->visible_page = item->page;
+ g_signal_emit (self, signals[ITEM_ACTIVATED], 0, item);
+
+ if (!page_changed)
+ {
+ um_carousel_move_arrow (self);
+ return;
+ }
+
page_name = g_strdup_printf ("%d", self->visible_page);
gtk_stack_set_visible_child_name (self->stack, page_name);
g_free (page_name);
update_buttons_visibility (self);
+
+ /* um_carousel_move_arrow is called from on_transition_running */
}
static void
@@ -355,11 +364,21 @@ on_size_allocate (UmCarousel *self)
if (self->selected_item == NULL)
return;
+ if (gtk_stack_get_transition_running (self->stack))
+ return;
+
self->arrow_start_x = um_carousel_item_get_x (self->selected_item, self);
um_carousel_move_arrow (self);
}
static void
+on_transition_running (UmCarousel *self)
+{
+ if (!gtk_stack_get_transition_running (self->stack))
+ um_carousel_move_arrow (self);
+}
+
+static void
um_carousel_init (UmCarousel *self)
{
GtkStyleProvider *provider;
@@ -377,4 +396,5 @@ um_carousel_init (UmCarousel *self)
g_object_unref (provider);
g_signal_connect_swapped (self->stack, "size-allocate", G_CALLBACK (on_size_allocate), self);
+ g_signal_connect_swapped (self->stack, "notify::transition-running", G_CALLBACK
(on_transition_running), self);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]