diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-09-13 18:11:29 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-09-17 20:39:12 +0200 |
| commit | a7ec3ba53fb9978cf6bae91816f80ad5f5cf88de (patch) | |
| tree | 70789c8646e1b966d6d33781c06665daa67c3d6b /gtk/gtkcsscomputedvaluesprivate.h | |
| parent | 7248c190373ae717b74d24d054a047c8d939efa4 (diff) | |
| download | gtk+-a7ec3ba53fb9978cf6bae91816f80ad5f5cf88de.tar.gz | |
csscomputedvalues: Get rid of animated values
Merge the animated values code into the computed values code. This
should get rid of various bugs related to animated->computed updating.
Diffstat (limited to 'gtk/gtkcsscomputedvaluesprivate.h')
| -rw-r--r-- | gtk/gtkcsscomputedvaluesprivate.h | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/gtk/gtkcsscomputedvaluesprivate.h b/gtk/gtkcsscomputedvaluesprivate.h index 1ddc4a776e..a79fc6c71f 100644 --- a/gtk/gtkcsscomputedvaluesprivate.h +++ b/gtk/gtkcsscomputedvaluesprivate.h @@ -43,13 +43,17 @@ struct _GtkCssComputedValues { GObject parent; - GPtrArray *values; - GPtrArray *sections; - GPtrArray *animated_values; - GtkBitmask *depends_on_parent; - GtkBitmask *equals_parent; - GtkBitmask *depends_on_color; - GtkBitmask *depends_on_font_size; + GPtrArray *values; /* the unanimated (aka intrinsic) values */ + GPtrArray *sections; /* sections the values are defined in */ + + GPtrArray *animated_values; /* NULL or array of animated values/NULL if not animated */ + gint64 current_time; /* the current time in our world */ + GSList *animations; /* the running animations, least important one first */ + + GtkBitmask *depends_on_parent; /* for intrinsic values */ + GtkBitmask *equals_parent; /* dito */ + GtkBitmask *depends_on_color; /* dito */ + GtkBitmask *depends_on_font_size; /* dito */ }; struct _GtkCssComputedValuesClass @@ -84,6 +88,13 @@ GtkCssValue * _gtk_css_computed_values_get_intrinsic_value (GtkCssCom GtkBitmask * _gtk_css_computed_values_get_difference (GtkCssComputedValues *values, GtkCssComputedValues *other); +void _gtk_css_computed_values_start_animations (GtkCssComputedValues *values, + gint64 timestamp, + GtkCssComputedValues *source, + GtkStyleContext *context); +GtkBitmask * _gtk_css_computed_values_advance (GtkCssComputedValues *values, + gint64 timestamp); +gboolean _gtk_css_computed_values_is_static (GtkCssComputedValues *values); G_END_DECLS |