AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

popover: port to progress tracker

Browse Source
This commit is contained in:
Matt Watson 2016-03-28 14:45:21 -07:00
parent 7ad64a20aa
commit dc8b80cd32
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkpopover.c
View File

@ -110,6 +110,7 @@
#include "gtkmenusectionbox.h" #include "gtkmenusectionbox.h"
#include "gtkroundedboxprivate.h" #include "gtkroundedboxprivate.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"
#include "gtkprogresstrackerprivate.h"
#ifdef GDK_WINDOWING_WAYLAND #ifdef GDK_WINDOWING_WAYLAND
#include "wayland/gdkwayland.h" #include "wayland/gdkwayland.h"
@ -156,6 +157,7 @@ struct _GtkPopoverPrivate
GtkAdjustment *hadj; GtkAdjustment *hadj;
GdkRectangle pointing_to; GdkRectangle pointing_to;
GtkPopoverConstraint constraint; GtkPopoverConstraint constraint;
GtkProgressTracker tracker;
guint prev_focus_unmap_id; guint prev_focus_unmap_id;
guint hierarchy_changed_id; guint hierarchy_changed_id;
guint size_allocate_id; guint size_allocate_id;
@ -173,7 +175,6 @@ struct _GtkPopoverPrivate
guint transitions_enabled : 1; guint transitions_enabled : 1;
guint state : 2; guint state : 2;
guint visible : 1; guint visible : 1;
gint64 start_time;
gint transition_diff; gint transition_diff;
guint tick_id; guint tick_id;
@ -510,17 +511,6 @@ gtk_popover_apply_modality (GtkPopover *popover,
} }
} }
/* From clutter-easing.c, based on Robert Penner's
* infamous easing equations, MIT license.
*/
static double
ease_out_cubic (double t)
{
double p = t - 1;
return p * p * p + 1;
}
static gboolean static gboolean
show_animate_cb (GtkWidget *widget, show_animate_cb (GtkWidget *widget,
GdkFrameClock *frame_clock, GdkFrameClock *frame_clock,
@ -528,15 +518,11 @@ show_animate_cb (GtkWidget *widget,
{ {
GtkPopover *popover = GTK_POPOVER (widget); GtkPopover *popover = GTK_POPOVER (widget);
GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover); GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
gint64 now = gdk_frame_clock_get_frame_time (frame_clock);
gdouble t; gdouble t;
if (now < (priv->start_time + TRANSITION_DURATION)) gtk_progress_tracker_advance_frame (&priv->tracker,
t = (now - priv->start_time) / (gdouble) (TRANSITION_DURATION); gdk_frame_clock_get_frame_time (frame_clock));
else t = gtk_progress_tracker_get_ease_out_cubic (&priv->tracker, FALSE);
t = 1.0;
t = ease_out_cubic (t);
if (priv->state == STATE_SHOWING) if (priv->state == STATE_SHOWING)
{ {
@ -551,7 +537,7 @@ show_animate_cb (GtkWidget *widget,
gtk_popover_update_position (popover); gtk_popover_update_position (popover);
if (t >= 1.0) if (gtk_progress_tracker_get_state (&priv->tracker) == GTK_PROGRESS_STATE_AFTER)
{ {
if (priv->state == STATE_SHOWING) if (priv->state == STATE_SHOWING)
{ {
@ -573,13 +559,11 @@ static void
gtk_popover_start_transition (GtkPopover *popover) gtk_popover_start_transition (GtkPopover *popover)
{ {
GtkPopoverPrivate *priv = popover->priv; GtkPopoverPrivate *priv = popover->priv;
GdkFrameClock *clock;
if (priv->tick_id != 0) if (priv->tick_id != 0)
return; return;
clock = gtk_widget_get_frame_clock (GTK_WIDGET (popover)); gtk_progress_tracker_start (&priv->tracker, TRANSITION_DURATION, 0, 1.0);
priv->start_time = gdk_frame_clock_get_frame_time (clock);
priv->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (popover), priv->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (popover),
show_animate_cb, show_animate_cb,
popover, NULL); popover, NULL);