[gtk+] Revert "popover: Optimize the transition"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "popover: Optimize the transition"
- Date: Fri, 21 Aug 2015 22:21:07 +0000 (UTC)
commit 58f363c852553b62b404da917d49cf6b360dfcc7
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Aug 21 18:08:30 2015 -0400
Revert "popover: Optimize the transition"
This reverts commit 84bd32a09a25bee24ae7740e30bd75727695d744.
It turned out that this did break the transition in some places.
gtk/gtkpopover.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index aa36ab5..98fc362 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]