summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@gnome.org>2018-08-22 12:23:50 +0300
committerErnestas Kulik <ernestask@gnome.org>2018-08-23 11:13:36 +0300
commitf40eb8a1febd5785fb2bb09adf5c70d9687bd313 (patch)
treee1109cbf49b077918fdb535ccdc24176978c0b7a
parent9e0f43e8cba45015487c692058c002f56087b9b8 (diff)
downloadgtk+-f40eb8a1febd5785fb2bb09adf5c70d9687bd313.tar.gz
revealer: Only clip child when animating
Currently, GtkRevealer clips the child if the transition type is sliding, regardless of whether the animation had already ended. An example where that is a problem would be in Nautilus: the file operations popover button is animated on reveal to draw attention, but, given that the button is in turn stashed inside a revealer with a sliding animation, things suddenly fall apart.
-rw-r--r--gtk/gtkrevealer.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c
index 49aa81458e..13c37b9a80 100644
--- a/gtk/gtkrevealer.c
+++ b/gtk/gtkrevealer.c
@@ -617,20 +617,20 @@ gtk_revealer_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot)
{
GtkRevealer *revealer = GTK_REVEALER (widget);
+ GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer);
GtkRevealerTransitionType transition;
GtkWidget *child;
+ gboolean clip_child;
child = gtk_bin_get_child (GTK_BIN (revealer));
if (child == NULL || !gtk_widget_get_mapped (child))
return;
transition = effective_transition (revealer);
- if (transition == GTK_REVEALER_TRANSITION_TYPE_NONE ||
- transition == GTK_REVEALER_TRANSITION_TYPE_CROSSFADE)
- {
- gtk_widget_snapshot_child (widget, child, snapshot);
- }
- else
+ clip_child = transition != GTK_REVEALER_TRANSITION_TYPE_NONE &&
+ transition != GTK_REVEALER_TRANSITION_TYPE_CROSSFADE &&
+ gtk_progress_tracker_get_state (&priv->tracker) != GTK_PROGRESS_STATE_AFTER;
+ if (clip_child)
{
gtk_snapshot_push_clip (snapshot,
&GRAPHENE_RECT_INIT(
@@ -641,6 +641,8 @@ gtk_revealer_snapshot (GtkWidget *widget,
gtk_widget_snapshot_child (widget, child, snapshot);
gtk_snapshot_pop (snapshot);
}
+ else
+ gtk_widget_snapshot_child (widget, child, snapshot);
}
/**