callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "popover: Optimize the transition"

Browse Source 
This reverts commit 84bd32a09a.

It turned out that this did break the transition in some places.
This commit is contained in:
Matthias Clasen
2015-08-21 18:08:30 -04:00
parent 00b17651b1
commit 58f363c852
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkpopover.c
View File

@ -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;