diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2015-08-21 18:08:30 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2015-08-21 18:08:30 -0400 |
| commit | 58f363c852553b62b404da917d49cf6b360dfcc7 (patch) | |
| tree | c94c386fd82fbfae22c06387a88e543ebd30a306 /gtk/gtkpopover.c | |
| parent | 00b17651b1d00cdaf60c7d75fcd5fc4945812361 (diff) | |
| download | gtk+-58f363c852553b62b404da917d49cf6b360dfcc7.tar.gz | |
Revert "popover: Optimize the transition"
This reverts commit 84bd32a09a25bee24ae7740e30bd75727695d744.
It turned out that this did break the transition in some places.
Diffstat (limited to 'gtk/gtkpopover.c')
| -rw-r--r-- | gtk/gtkpopover.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index aa36ab564c..98fc362676 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -518,6 +518,8 @@ show_animate_cb (GtkWidget *widget, gtk_widget_set_opacity (widget, 1.0 - t); } + gtk_widget_queue_resize (GTK_WIDGET (popover)); + if (t >= 1.0) { if (priv->state == STATE_SHOWING) @@ -530,10 +532,10 @@ show_animate_cb (GtkWidget *widget, else gtk_popover_set_state (popover, STATE_HIDDEN); - return G_SOURCE_REMOVE; + return FALSE; } else - return G_SOURCE_CONTINUE; + return TRUE; } static void @@ -573,7 +575,7 @@ gtk_popover_set_state (GtkPopover *popover, gtk_popover_start_transition (popover); else { - if (priv->tick_id != 0) + if (priv->tick_id) { gtk_widget_remove_tick_callback (GTK_WIDGET (popover), priv->tick_id); priv->tick_id = 0; |