Hi, Here is a patch I made while I was porting tidy-viewport (and related files) to clutter-0.9.
One notable thing is to replace CLUTTER_UNITS_TO_FIXED with CLUTTER_UNITS_TO_FLOAT in tidy_viewport_paint(), or the numeric parameter will be casted quietly in runtime -- hard to locate. Hope this helps. --Roger On Mon, Apr 27, 2009 at 04:00:06PM +0800, Tomas Frydrych wrote: > Kiran Bhide (RBEI/ECG3) wrote: > > Is there a tidy package build for Clutter-0.9 ? Or when is it expected ? > > The one in GIT still uses Clutter-0.8 and build with Clutter-0.9 breaks ! > > Not compalining but just eager to know :) > > No there isn't one; Tidy is only maintained for each stable release, and > will be updated after 1.0 is released. As always, patches to make it > work with the 0.9/1.0 API filed in the bugzilla are welcome. > > Tomas > > -- > To unsubscribe send a mail to [email protected] >
>From 1fa057dd61bb09dc215d7369df6d45f9fcbc027d Mon Sep 17 00:00:00 2001 From: Wang, Roger <[email protected]> Date: Tue, 12 May 2009 20:59:40 +0800 Subject: [PATCH] viewport and related update for clutter-0.9/1.0 one of the notable fix is to replace CLUTTER_UNITS_TO_FIXED with CLUTTER_UNITS_TO_FLOAT in tidy_viewport_paint() --- tidy/tidy-adjustment.c | 145 +++++++++++++++++++++++------------------------ tidy/tidy-adjustment.h | 48 ++++++++-------- tidy/tidy-depth-group.c | 4 +- tidy/tidy-depth-group.h | 2 +- tidy/tidy-scrollable.h | 2 +- tidy/tidy-viewport.c | 124 ++++++++++++++++++++-------------------- tidy/tidy-viewport.h | 2 +- 7 files changed, 161 insertions(+), 166 deletions(-) diff --git a/tidy/tidy-adjustment.c b/tidy/tidy-adjustment.c index f681716..7c1e5f3 100644 --- a/tidy/tidy-adjustment.c +++ b/tidy/tidy-adjustment.c @@ -25,9 +25,7 @@ #endif #include <glib-object.h> -#include <clutter/clutter-alpha.h> -#include <clutter/clutter-fixed.h> -#include <clutter/clutter-timeline.h> +#include <clutter/clutter.h> #include "tidy-adjustment.h" #include "tidy-marshal.h" @@ -39,18 +37,18 @@ G_DEFINE_TYPE (TidyAdjustment, tidy_adjustment, G_TYPE_OBJECT) struct _TidyAdjustmentPrivate { - ClutterFixed lower; - ClutterFixed upper; - ClutterFixed value; - ClutterFixed step_increment; - ClutterFixed page_increment; - ClutterFixed page_size; + CoglFixed lower; + CoglFixed upper; + CoglFixed value; + CoglFixed step_increment; + CoglFixed page_increment; + CoglFixed page_size; /* For interpolation */ ClutterTimeline *interpolation; - ClutterFixed dx; - ClutterFixed old_position; - ClutterFixed new_position; + CoglFixed dx; + CoglFixed old_position; + CoglFixed new_position; /* For elasticity */ gboolean elastic; @@ -103,27 +101,27 @@ tidy_adjustment_get_property (GObject *object, switch (prop_id) { case PROP_LOWER: - g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->lower)); + g_value_set_double (value, COGL_FIXED_TO_DOUBLE (priv->lower)); break; case PROP_UPPER: - g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->upper)); + g_value_set_double (value, COGL_FIXED_TO_DOUBLE (priv->upper)); break; case PROP_VALUE: - g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->value)); + g_value_set_double (value, COGL_FIXED_TO_DOUBLE (priv->value)); break; case PROP_STEP_INC: - g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->step_increment)); + g_value_set_double (value, COGL_FIXED_TO_DOUBLE (priv->step_increment)); break; case PROP_PAGE_INC: - g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->page_increment)); + g_value_set_double (value, COGL_FIXED_TO_DOUBLE (priv->page_increment)); break; case PROP_PAGE_SIZE: - g_value_set_double (value, CLUTTER_FIXED_TO_DOUBLE (priv->page_size)); + g_value_set_double (value, COGL_FIXED_TO_DOUBLE (priv->page_size)); break; case PROP_ELASTIC: @@ -324,12 +322,12 @@ tidy_adjustment_new (gdouble value, } TidyAdjustment * -tidy_adjustment_newx (ClutterFixed value, - ClutterFixed lower, - ClutterFixed upper, - ClutterFixed step_increment, - ClutterFixed page_increment, - ClutterFixed page_size) +tidy_adjustment_newx (CoglFixed value, + CoglFixed lower, + CoglFixed upper, + CoglFixed step_increment, + CoglFixed page_increment, + CoglFixed page_size) { TidyAdjustment *retval; TidyAdjustmentPrivate *priv; @@ -347,7 +345,7 @@ tidy_adjustment_newx (ClutterFixed value, return retval; } -ClutterFixed +CoglFixed tidy_adjustment_get_valuex (TidyAdjustment *adjustment) { TidyAdjustmentPrivate *priv; @@ -370,12 +368,12 @@ tidy_adjustment_get_value (TidyAdjustment *adjustment) { g_return_val_if_fail (TIDY_IS_ADJUSTMENT (adjustment), 0.0); - return CLUTTER_FIXED_TO_FLOAT (adjustment->priv->value); + return COGL_FIXED_TO_FLOAT (adjustment->priv->value); } void tidy_adjustment_set_valuex (TidyAdjustment *adjustment, - ClutterFixed value) + CoglFixed value) { TidyAdjustmentPrivate *priv; @@ -400,13 +398,13 @@ void tidy_adjustment_set_value (TidyAdjustment *adjustment, gdouble value) { - tidy_adjustment_set_valuex (adjustment, CLUTTER_FLOAT_TO_FIXED (value)); + tidy_adjustment_set_valuex (adjustment, COGL_FIXED_FROM_FLOAT (value)); } void tidy_adjustment_clamp_pagex (TidyAdjustment *adjustment, - ClutterFixed lower, - ClutterFixed upper) + CoglFixed lower, + CoglFixed upper) { gboolean changed; TidyAdjustmentPrivate *priv; @@ -444,8 +442,8 @@ tidy_adjustment_clamp_page (TidyAdjustment *adjustment, gdouble upper) { tidy_adjustment_clamp_pagex (adjustment, - CLUTTER_FLOAT_TO_FIXED (lower), - CLUTTER_FLOAT_TO_FIXED (upper)); + COGL_FIXED_FROM_FLOAT (lower), + COGL_FIXED_FROM_FLOAT (upper)); } static void @@ -453,7 +451,7 @@ tidy_adjustment_set_lower (TidyAdjustment *adjustment, gdouble lower) { TidyAdjustmentPrivate *priv = adjustment->priv; - ClutterFixed value = CLUTTER_FLOAT_TO_FIXED (lower); + CoglFixed value = COGL_FIXED_FROM_FLOAT (lower); if (priv->lower != value) { @@ -472,7 +470,7 @@ tidy_adjustment_set_upper (TidyAdjustment *adjustment, gdouble upper) { TidyAdjustmentPrivate *priv = adjustment->priv; - ClutterFixed value = CLUTTER_FLOAT_TO_FIXED (upper); + CoglFixed value = COGL_FIXED_FROM_FLOAT (upper); if (priv->upper != value) { @@ -491,7 +489,7 @@ tidy_adjustment_set_step_increment (TidyAdjustment *adjustment, gdouble step) { TidyAdjustmentPrivate *priv = adjustment->priv; - ClutterFixed value = CLUTTER_FLOAT_TO_FIXED (step); + CoglFixed value = COGL_FIXED_FROM_FLOAT (step); if (priv->step_increment != value) { @@ -508,7 +506,7 @@ tidy_adjustment_set_page_increment (TidyAdjustment *adjustment, gdouble page) { TidyAdjustmentPrivate *priv = adjustment->priv; - ClutterFixed value = CLUTTER_FLOAT_TO_FIXED (page); + CoglFixed value = COGL_FIXED_FROM_FLOAT (page); if (priv->page_increment != value) { @@ -525,7 +523,7 @@ tidy_adjustment_set_page_size (TidyAdjustment *adjustment, gdouble size) { TidyAdjustmentPrivate *priv = adjustment->priv; - ClutterFixed value = CLUTTER_FLOAT_TO_FIXED (size); + CoglFixed value = COGL_FIXED_FROM_FLOAT (size); if (priv->page_size != value) { @@ -541,12 +539,12 @@ tidy_adjustment_set_page_size (TidyAdjustment *adjustment, void tidy_adjustment_set_valuesx (TidyAdjustment *adjustment, - ClutterFixed value, - ClutterFixed lower, - ClutterFixed upper, - ClutterFixed step_increment, - ClutterFixed page_increment, - ClutterFixed page_size) + CoglFixed value, + CoglFixed lower, + CoglFixed upper, + CoglFixed step_increment, + CoglFixed page_increment, + CoglFixed page_size) { TidyAdjustmentPrivate *priv; gboolean emit_changed = FALSE; @@ -619,22 +617,22 @@ tidy_adjustment_set_values (TidyAdjustment *adjustment, gdouble page_size) { tidy_adjustment_set_valuesx (adjustment, - CLUTTER_FLOAT_TO_FIXED (value), - CLUTTER_FLOAT_TO_FIXED (lower), - CLUTTER_FLOAT_TO_FIXED (upper), - CLUTTER_FLOAT_TO_FIXED (step_increment), - CLUTTER_FLOAT_TO_FIXED (page_increment), - CLUTTER_FLOAT_TO_FIXED (page_size)); + COGL_FIXED_FROM_FLOAT (value), + COGL_FIXED_FROM_FLOAT (lower), + COGL_FIXED_FROM_FLOAT (upper), + COGL_FIXED_FROM_FLOAT (step_increment), + COGL_FIXED_FROM_FLOAT (page_increment), + COGL_FIXED_FROM_FLOAT (page_size)); } void tidy_adjustment_get_valuesx (TidyAdjustment *adjustment, - ClutterFixed *value, - ClutterFixed *lower, - ClutterFixed *upper, - ClutterFixed *step_increment, - ClutterFixed *page_increment, - ClutterFixed *page_size) + CoglFixed *value, + CoglFixed *lower, + CoglFixed *upper, + CoglFixed *step_increment, + CoglFixed *page_increment, + CoglFixed *page_size) { TidyAdjustmentPrivate *priv; @@ -677,22 +675,22 @@ tidy_adjustment_get_values (TidyAdjustment *adjustment, priv = adjustment->priv; if (lower) - *lower = CLUTTER_FIXED_TO_DOUBLE (priv->lower); + *lower = COGL_FIXED_TO_DOUBLE (priv->lower); if (upper) - *upper = CLUTTER_FIXED_TO_DOUBLE (priv->upper); + *upper = COGL_FIXED_TO_DOUBLE (priv->upper); if (value) - *value = CLUTTER_FIXED_TO_DOUBLE (tidy_adjustment_get_valuex (adjustment)); + *value = COGL_FIXED_TO_DOUBLE (tidy_adjustment_get_valuex (adjustment)); if (step_increment) - *step_increment = CLUTTER_FIXED_TO_DOUBLE (priv->step_increment); + *step_increment = COGL_FIXED_TO_DOUBLE (priv->step_increment); if (page_increment) - *page_increment = CLUTTER_FIXED_TO_DOUBLE (priv->page_increment); + *page_increment = COGL_FIXED_TO_DOUBLE (priv->page_increment); if (page_size) - *page_size = CLUTTER_FIXED_TO_DOUBLE (priv->page_size); + *page_size = COGL_FIXED_TO_DOUBLE (priv->page_size); } static void @@ -705,17 +703,16 @@ interpolation_new_frame_cb (ClutterTimeline *timeline, priv->interpolation = NULL; if (priv->elastic) { - gdouble progress = clutter_alpha_get_alpha (priv->bounce_alpha) / - (gdouble)CLUTTER_ALPHA_MAX_ALPHA; - gdouble dx = CLUTTER_FIXED_TO_FLOAT (priv->old_position) + - CLUTTER_FIXED_TO_FLOAT (priv->new_position - priv->old_position) * + gdouble progress = clutter_alpha_get_alpha (priv->bounce_alpha) / 1; + gdouble dx = COGL_FIXED_TO_FLOAT (priv->old_position) + + COGL_FIXED_TO_FLOAT (priv->new_position - priv->old_position) * progress; tidy_adjustment_set_value (adjustment, dx); } else tidy_adjustment_set_valuex (adjustment, priv->old_position + - clutter_qmulx (CLUTTER_INT_TO_FIXED (frame_num), + COGL_FIXED_MUL (COGL_FIXED_FROM_INT (frame_num), priv->dx)); priv->interpolation = timeline; } @@ -742,7 +739,7 @@ static guint32 bounce_alpha_func (ClutterAlpha *alpha, gpointer user_data) { - ClutterFixed progress, angle; + CoglFixed progress, angle; ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha); progress = clutter_timeline_get_progressx (timeline); @@ -755,7 +752,7 @@ bounce_alpha_func (ClutterAlpha *alpha, void tidy_adjustment_interpolatex (TidyAdjustment *adjustment, - ClutterFixed value, + CoglFixed value, guint n_frames, guint fps) { @@ -772,15 +769,13 @@ tidy_adjustment_interpolatex (TidyAdjustment *adjustment, priv->old_position = priv->value; priv->new_position = value; - priv->dx = clutter_qdivx (priv->new_position - priv->old_position, - CLUTTER_INT_TO_FIXED (n_frames)); + priv->dx = COGL_FIXED_DIV (priv->new_position - priv->old_position, + COGL_FIXED_FROM_INT (n_frames)); priv->interpolation = clutter_timeline_new (n_frames, fps); if (priv->elastic) priv->bounce_alpha = clutter_alpha_new_full (priv->interpolation, - CLUTTER_ALPHA_SINE_INC, - NULL, NULL); - + CLUTTER_EASE_OUT_SINE); g_signal_connect (priv->interpolation, "new-frame", G_CALLBACK (interpolation_new_frame_cb), @@ -800,7 +795,7 @@ tidy_adjustment_interpolate (TidyAdjustment *adjustment, guint fps) { tidy_adjustment_interpolatex (adjustment, - CLUTTER_FLOAT_TO_FIXED (value), + COGL_FIXED_FROM_FLOAT (value), n_frames, fps); } @@ -825,7 +820,7 @@ tidy_adjustment_clamp (TidyAdjustment *adjustment, guint fps) { TidyAdjustmentPrivate *priv = adjustment->priv; - ClutterFixed dest = priv->value; + CoglFixed dest = priv->value; if (priv->value < priv->lower) dest = priv->lower; diff --git a/tidy/tidy-adjustment.h b/tidy/tidy-adjustment.h index cd51049..b890269 100644 --- a/tidy/tidy-adjustment.h +++ b/tidy/tidy-adjustment.h @@ -24,7 +24,7 @@ #define __TIDY_ADJUSTMENT_H__ #include <glib-object.h> -#include <clutter/clutter-fixed.h> +#include <clutter/clutter.h> G_BEGIN_DECLS @@ -77,24 +77,24 @@ TidyAdjustment *tidy_adjustment_new (gdouble value, gdouble step_increment, gdouble page_increment, gdouble page_size); -TidyAdjustment *tidy_adjustment_newx (ClutterFixed value, - ClutterFixed lower, - ClutterFixed upper, - ClutterFixed step_increment, - ClutterFixed page_increment, - ClutterFixed page_size); +TidyAdjustment *tidy_adjustment_newx (CoglFixed value, + CoglFixed lower, + CoglFixed upper, + CoglFixed step_increment, + CoglFixed page_increment, + CoglFixed page_size); gdouble tidy_adjustment_get_value (TidyAdjustment *adjustment); -ClutterFixed tidy_adjustment_get_valuex (TidyAdjustment *adjustment); +CoglFixed tidy_adjustment_get_valuex (TidyAdjustment *adjustment); void tidy_adjustment_set_value (TidyAdjustment *adjustment, gdouble value); void tidy_adjustment_set_valuex (TidyAdjustment *adjustment, - ClutterFixed value); + CoglFixed value); void tidy_adjustment_clamp_page (TidyAdjustment *adjustment, gdouble lower, gdouble upper); void tidy_adjustment_clamp_pagex (TidyAdjustment *adjustment, - ClutterFixed lower, - ClutterFixed upper); + CoglFixed lower, + CoglFixed upper); void tidy_adjustment_set_values (TidyAdjustment *adjustment, gdouble value, gdouble lower, @@ -103,12 +103,12 @@ void tidy_adjustment_set_values (TidyAdjustment *adjustment, gdouble page_increment, gdouble page_size); void tidy_adjustment_set_valuesx (TidyAdjustment *adjustment, - ClutterFixed value, - ClutterFixed lower, - ClutterFixed upper, - ClutterFixed step_increment, - ClutterFixed page_increment, - ClutterFixed page_size); + CoglFixed value, + CoglFixed lower, + CoglFixed upper, + CoglFixed step_increment, + CoglFixed page_increment, + CoglFixed page_size); void tidy_adjustment_get_values (TidyAdjustment *adjustment, gdouble *value, gdouble *lower, @@ -117,19 +117,19 @@ void tidy_adjustment_get_values (TidyAdjustment *adjustment, gdouble *page_increment, gdouble *page_size); void tidy_adjustment_get_valuesx (TidyAdjustment *adjustment, - ClutterFixed *value, - ClutterFixed *lower, - ClutterFixed *upper, - ClutterFixed *step_increment, - ClutterFixed *page_increment, - ClutterFixed *page_size); + CoglFixed *value, + CoglFixed *lower, + CoglFixed *upper, + CoglFixed *step_increment, + CoglFixed *page_increment, + CoglFixed *page_size); void tidy_adjustment_interpolate (TidyAdjustment *adjustment, gdouble value, guint n_frames, guint fps); void tidy_adjustment_interpolatex (TidyAdjustment *adjustment, - ClutterFixed value, + CoglFixed value, guint n_frames, guint fps); diff --git a/tidy/tidy-depth-group.c b/tidy/tidy-depth-group.c index cc39659..27faed0 100644 --- a/tidy/tidy-depth-group.c +++ b/tidy/tidy-depth-group.c @@ -43,9 +43,9 @@ static void tidy_depth_group_paint (ClutterActor *actor) { cogl_enable_depth_test (TRUE); - + CLUTTER_ACTOR_CLASS (tidy_depth_group_parent_class)->paint (actor); - + cogl_enable_depth_test (FALSE); } diff --git a/tidy/tidy-depth-group.h b/tidy/tidy-depth-group.h index b70d54c..447f225 100644 --- a/tidy/tidy-depth-group.h +++ b/tidy/tidy-depth-group.h @@ -24,7 +24,7 @@ #define __TIDY_DEPTH_GROUP_H__ #include <glib-object.h> -#include <clutter/clutter-group.h> +#include <clutter/clutter.h> G_BEGIN_DECLS diff --git a/tidy/tidy-scrollable.h b/tidy/tidy-scrollable.h index 4710897..ce4a4ce 100644 --- a/tidy/tidy-scrollable.h +++ b/tidy/tidy-scrollable.h @@ -24,7 +24,7 @@ #define __TIDY_SCROLLABLE_H__ #include <glib-object.h> -#include <tidy/tidy-adjustment.h> +#include "tidy-adjustment.h" G_BEGIN_DECLS diff --git a/tidy/tidy-viewport.c b/tidy/tidy-viewport.c index 33602e0..c28a8c7 100644 --- a/tidy/tidy-viewport.c +++ b/tidy/tidy-viewport.c @@ -54,10 +54,10 @@ struct _TidyViewportPrivate ClutterUnit x; ClutterUnit y; ClutterUnit z; - + TidyAdjustment *hadjustment; TidyAdjustment *vadjustment; - + gboolean sync_adjustments; }; @@ -80,7 +80,7 @@ tidy_viewport_get_property (GObject *object, GParamSpec *pspec) { TidyAdjustment *adjustment; - + TidyViewportPrivate *priv = TIDY_VIEWPORT (object)->priv; switch (prop_id) @@ -106,7 +106,7 @@ tidy_viewport_get_property (GObject *object, scrollable_get_adjustments (TIDY_SCROLLABLE (object), NULL, &adjustment); g_value_set_object (value, adjustment); break; - + case PROP_SYNC_ADJUST : g_value_set_boolean (value, priv->sync_adjustments); break; @@ -160,7 +160,7 @@ tidy_viewport_set_property (GObject *object, priv->hadjustment, g_value_get_object (value)); break; - + case PROP_SYNC_ADJUST : priv->sync_adjustments = g_value_get_boolean (value); break; @@ -175,7 +175,7 @@ static void tidy_viewport_dispose (GObject *gobject) { TidyViewportPrivate *priv = TIDY_VIEWPORT (gobject)->priv; - + if (priv->hadjustment) { g_object_unref (priv->hadjustment); @@ -195,15 +195,15 @@ static void tidy_viewport_paint (ClutterActor *self) { TidyViewportPrivate *priv = TIDY_VIEWPORT (self)->priv; - + cogl_push_matrix (); - - cogl_translatex (CLUTTER_UNITS_TO_FIXED (priv->x) * -1, - CLUTTER_UNITS_TO_FIXED (priv->y) * -1, - CLUTTER_UNITS_TO_FIXED (priv->z) * -1); - + + cogl_translate (CLUTTER_UNITS_TO_FLOAT (priv->x) * -1, + CLUTTER_UNITS_TO_FLOAT (priv->y) * -1, + CLUTTER_UNITS_TO_FLOAT (priv->z) * -1); + CLUTTER_ACTOR_CLASS (tidy_viewport_parent_class)->paint (self); - + cogl_pop_matrix (); } @@ -219,8 +219,8 @@ tidy_viewport_allocate (ClutterActor *self, const ClutterActorBox *box, gboolean absolute_origin_changed) { - ClutterFixed prev_value; - + CoglFixed prev_value; + TidyViewportPrivate *priv = TIDY_VIEWPORT (self)->priv; /* Chain up */ @@ -236,19 +236,19 @@ tidy_viewport_allocate (ClutterActor *self, "lower", 0.0, "upper", CLUTTER_UNITS_TO_FLOAT (box->x2 - box->x1), NULL); - + /* Make sure value is clamped */ prev_value = tidy_adjustment_get_valuex (priv->hadjustment); tidy_adjustment_set_valuex (priv->hadjustment, prev_value); } - + if (priv->vadjustment) { g_object_set (G_OBJECT (priv->vadjustment), "lower", 0.0, "upper", CLUTTER_UNITS_TO_FLOAT (box->y2 - box->y1), NULL); - + prev_value = tidy_adjustment_get_valuex (priv->vadjustment); tidy_adjustment_set_valuex (priv->vadjustment, prev_value); } @@ -266,11 +266,11 @@ tidy_viewport_class_init (TidyViewportClass *klass) gobject_class->get_property = tidy_viewport_get_property; gobject_class->set_property = tidy_viewport_set_property; gobject_class->dispose = tidy_viewport_dispose; - + actor_class->paint = tidy_viewport_paint; actor_class->pick = tidy_viewport_pick; actor_class->allocate = tidy_viewport_allocate; - + g_object_class_install_property (gobject_class, PROP_X_ORIGIN, g_param_spec_int ("x-origin", @@ -309,7 +309,7 @@ tidy_viewport_class_init (TidyViewportClass *klass) "viewport size", TRUE, G_PARAM_READWRITE)); - + g_object_class_override_property (gobject_class, PROP_HADJUST, "hadjustment"); @@ -325,10 +325,10 @@ hadjustment_value_notify_cb (TidyAdjustment *adjustment, TidyViewport *viewport) { TidyViewportPrivate *priv = viewport->priv; - ClutterFixed value; + CoglFixed value; value = tidy_adjustment_get_valuex (adjustment); - + tidy_viewport_set_originu (viewport, CLUTTER_UNITS_FROM_FIXED (value), priv->y, @@ -340,10 +340,10 @@ vadjustment_value_notify_cb (TidyAdjustment *adjustment, GParamSpec *arg1, TidyViewport *viewport) { TidyViewportPrivate *priv = viewport->priv; - ClutterFixed value; + CoglFixed value; value = tidy_adjustment_get_valuex (adjustment); - + tidy_viewport_set_originu (viewport, priv->x, CLUTTER_UNITS_FROM_FIXED (value), @@ -356,7 +356,7 @@ scrollable_set_adjustments (TidyScrollable *scrollable, TidyAdjustment *vadjustment) { TidyViewportPrivate *priv = TIDY_VIEWPORT (scrollable)->priv; - + if (hadjustment != priv->hadjustment) { if (priv->hadjustment) @@ -366,7 +366,7 @@ scrollable_set_adjustments (TidyScrollable *scrollable, scrollable); g_object_unref (priv->hadjustment); } - + if (hadjustment) { g_object_ref (hadjustment); @@ -374,7 +374,7 @@ scrollable_set_adjustments (TidyScrollable *scrollable, G_CALLBACK (hadjustment_value_notify_cb), scrollable); } - + priv->hadjustment = hadjustment; } @@ -387,7 +387,7 @@ scrollable_set_adjustments (TidyScrollable *scrollable, scrollable); g_object_unref (priv->vadjustment); } - + if (vadjustment) { g_object_ref (vadjustment); @@ -395,7 +395,7 @@ scrollable_set_adjustments (TidyScrollable *scrollable, G_CALLBACK (vadjustment_value_notify_cb), scrollable); } - + priv->vadjustment = vadjustment; } } @@ -406,11 +406,11 @@ scrollable_get_adjustments (TidyScrollable *scrollable, TidyAdjustment **vadjustment) { TidyViewportPrivate *priv; - + g_return_if_fail (TIDY_IS_VIEWPORT (scrollable)); - + priv = ((TidyViewport *)scrollable)->priv; - + if (hadjustment) { if (priv->hadjustment) @@ -418,16 +418,16 @@ scrollable_get_adjustments (TidyScrollable *scrollable, else { TidyAdjustment *adjustment; - ClutterFixed width, stage_width, increment; - + CoglFixed width, stage_width, increment; + width = CLUTTER_UNITS_TO_FIXED(clutter_actor_get_widthu (CLUTTER_ACTOR(scrollable))); stage_width = CLUTTER_UNITS_TO_FIXED(clutter_actor_get_widthu (clutter_stage_get_default ())); - increment = MAX (CFX_ONE, MIN(stage_width, width)); - + increment = MAX (COGL_FIXED_1, MIN(stage_width, width)); + adjustment = tidy_adjustment_newx (CLUTTER_UNITS_TO_FIXED(priv->x), 0, width, - CFX_ONE, + COGL_FIXED_1, increment, increment); scrollable_set_adjustments (scrollable, @@ -436,7 +436,7 @@ scrollable_get_adjustments (TidyScrollable *scrollable, *hadjustment = adjustment; } } - + if (vadjustment) { if (priv->vadjustment) @@ -444,16 +444,16 @@ scrollable_get_adjustments (TidyScrollable *scrollable, else { TidyAdjustment *adjustment; - ClutterFixed height, stage_height, increment; - + CoglFixed height, stage_height, increment; + height = CLUTTER_UNITS_TO_FIXED(clutter_actor_get_heightu (CLUTTER_ACTOR(scrollable))); stage_height = CLUTTER_UNITS_TO_FIXED(clutter_actor_get_heightu (clutter_stage_get_default ())); - increment = MAX (CFX_ONE, MIN(stage_height, height)); - + increment = MAX (COGL_FIXED_1, MIN(stage_height, height)); + adjustment = tidy_adjustment_newx (CLUTTER_UNITS_TO_FIXED(priv->y), 0, height, - CFX_ONE, + COGL_FIXED_1, increment, increment); scrollable_set_adjustments (scrollable, @@ -478,10 +478,10 @@ clip_notify_cb (ClutterActor *actor, { gint width, height; TidyViewportPrivate *priv = self->priv; - + if (!priv->sync_adjustments) return; - + if (!clutter_actor_has_clip (actor)) { if (priv->hadjustment) @@ -490,12 +490,12 @@ clip_notify_cb (ClutterActor *actor, g_object_set (priv->vadjustment, "page-size", (gdouble)1.0, NULL); return; } - + clutter_actor_get_clip (actor, NULL, NULL, &width, &height); if (priv->hadjustment) g_object_set (priv->hadjustment, "page-size", (gdouble)width, NULL); - + if (priv->vadjustment) g_object_set (priv->vadjustment, "page-size", (gdouble)height, NULL); } @@ -504,9 +504,9 @@ static void tidy_viewport_init (TidyViewport *self) { self->priv = VIEWPORT_PRIVATE (self); - + self->priv->sync_adjustments = TRUE; - + g_signal_connect (self, "notify::clip", G_CALLBACK (clip_notify_cb), self); } @@ -524,18 +524,18 @@ tidy_viewport_set_originu (TidyViewport *viewport, ClutterUnit z) { TidyViewportPrivate *priv; - + g_return_if_fail (TIDY_IS_VIEWPORT (viewport)); - + priv = viewport->priv; g_object_freeze_notify (G_OBJECT (viewport)); - + if (x != priv->x) { priv->x = x; g_object_notify (G_OBJECT (viewport), "x-origin"); - + if (priv->hadjustment) tidy_adjustment_set_valuex (priv->hadjustment, CLUTTER_UNITS_TO_FIXED (x)); @@ -556,7 +556,7 @@ tidy_viewport_set_originu (TidyViewport *viewport, priv->z = z; g_object_notify (G_OBJECT (viewport), "z-origin"); } - + g_object_thaw_notify (G_OBJECT (viewport)); clutter_actor_queue_redraw (CLUTTER_ACTOR (viewport)); @@ -569,7 +569,7 @@ tidy_viewport_set_origin (TidyViewport *viewport, gint z) { g_return_if_fail (TIDY_IS_VIEWPORT (viewport)); - + tidy_viewport_set_originu (viewport, CLUTTER_UNITS_FROM_DEVICE (x), CLUTTER_UNITS_FROM_DEVICE (y), @@ -583,11 +583,11 @@ tidy_viewport_get_originu (TidyViewport *viewport, ClutterUnit *z) { TidyViewportPrivate *priv; - + g_return_if_fail (TIDY_IS_VIEWPORT (viewport)); - + priv = viewport->priv; - + if (x) *x = priv->x; @@ -605,11 +605,11 @@ tidy_viewport_get_origin (TidyViewport *viewport, gint *z) { TidyViewportPrivate *priv; - + g_return_if_fail (TIDY_IS_VIEWPORT (viewport)); - + priv = viewport->priv; - + if (x) *x = CLUTTER_UNITS_TO_DEVICE (priv->x); diff --git a/tidy/tidy-viewport.h b/tidy/tidy-viewport.h index eb457bf..ef61005 100644 --- a/tidy/tidy-viewport.h +++ b/tidy/tidy-viewport.h @@ -24,7 +24,7 @@ #define __TIDY_VIEWPORT_H__ #include <glib-object.h> -#include <clutter/clutter-group.h> +#include <clutter/clutter.h> G_BEGIN_DECLS -- 1.6.3
