[mutter] clutter: Remove deprecated/clutter-behaviour-scale.c
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove deprecated/clutter-behaviour-scale.c
- Date: Tue, 22 Oct 2019 19:09:57 +0000 (UTC)
commit 33d1bae03f09ca1bf81212b327604e3847252724
Author: Adam Jackson <ajax redhat com>
Date: Tue Oct 22 12:04:42 2019 -0400
clutter: Remove deprecated/clutter-behaviour-scale.c
https://gitlab.gnome.org/GNOME/mutter/merge_requests/879
clutter/clutter/clutter-deprecated.h | 1 -
.../clutter/deprecated/clutter-behaviour-scale.c | 437 ---------------------
.../clutter/deprecated/clutter-behaviour-scale.h | 107 -----
clutter/clutter/meson.build | 2 -
src/tests/clutter/interactive/meson.build | 1 -
src/tests/clutter/interactive/test-actors.c | 26 --
src/tests/clutter/interactive/test-paint-wrapper.c | 26 --
src/tests/clutter/interactive/test-scale.c | 125 ------
8 files changed, 725 deletions(-)
---
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index c5bc5d0ea..f13d0cf28 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -8,7 +8,6 @@
#include "deprecated/clutter-animatable.h"
#include "deprecated/clutter-animation.h"
#include "deprecated/clutter-behaviour.h"
-#include "deprecated/clutter-behaviour-scale.h"
#include "deprecated/clutter-bin-layout.h"
#include "deprecated/clutter-box.h"
#include "deprecated/clutter-cairo-texture.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 92470dc50..08a3b6082 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -223,7 +223,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-animatable.h',
'deprecated/clutter-animation.h',
'deprecated/clutter-behaviour.h',
- 'deprecated/clutter-behaviour-scale.h',
'deprecated/clutter-bin-layout.h',
'deprecated/clutter-box.h',
'deprecated/clutter-cairo-texture.h',
@@ -243,7 +242,6 @@ clutter_deprecated_sources = [
'deprecated/clutter-alpha.c',
'deprecated/clutter-animation.c',
'deprecated/clutter-behaviour.c',
- 'deprecated/clutter-behaviour-scale.c',
'deprecated/clutter-box.c',
'deprecated/clutter-cairo-texture.c',
'deprecated/clutter-group.c',
diff --git a/src/tests/clutter/interactive/meson.build b/src/tests/clutter/interactive/meson.build
index cc961173c..ae6bda165 100644
--- a/src/tests/clutter/interactive/meson.build
+++ b/src/tests/clutter/interactive/meson.build
@@ -19,7 +19,6 @@ clutter_tests_interactive_test_sources = [
'test-texture-async.c',
'test-texture-material.c',
'test-events.c',
- 'test-scale.c',
'test-actors.c',
'test-shader-effects.c',
'test-script.c',
diff --git a/src/tests/clutter/interactive/test-actors.c b/src/tests/clutter/interactive/test-actors.c
index ae12d7a08..4bb0b8636 100644
--- a/src/tests/clutter/interactive/test-actors.c
+++ b/src/tests/clutter/interactive/test-actors.c
@@ -20,8 +20,6 @@ typedef struct SuperOH
gint stage_height;
gfloat radius;
- ClutterBehaviour *scaler_1;
- ClutterBehaviour *scaler_2;
ClutterTimeline *timeline;
} SuperOH;
@@ -155,20 +153,9 @@ stop_and_quit (ClutterActor *stage,
clutter_main_quit ();
}
-static gdouble
-my_sine_wave (ClutterAlpha *alpha,
- gpointer dummy G_GNUC_UNUSED)
-{
- ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
- gdouble progress = clutter_timeline_get_progress (timeline);
-
- return sin (progress * G_PI);
-}
-
G_MODULE_EXPORT int
test_actors_main (int argc, char *argv[])
{
- ClutterAlpha *alpha;
SuperOH *oh;
gint i;
GError *error;
@@ -207,12 +194,6 @@ test_actors_main (int argc, char *argv[])
/* fire a callback for frame change */
g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
- /* Set up some behaviours to handle scaling */
- alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
-
- oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
- oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
-
file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
real_hand = clutter_texture_new_from_file (file, &error);
if (real_hand == NULL)
@@ -283,11 +264,6 @@ test_actors_main (int argc, char *argv[])
g_signal_connect (oh->hand[i], "destroy",
G_CALLBACK (on_hand_destroy),
oh);
-
- if (i % 2)
- clutter_behaviour_apply (oh->scaler_1, oh->hand[i]);
- else
- clutter_behaviour_apply (oh->scaler_2, oh->hand[i]);
}
/* Add the group to the stage */
@@ -308,8 +284,6 @@ test_actors_main (int argc, char *argv[])
clutter_timeline_stop (oh->timeline);
/* clean up */
- g_object_unref (oh->scaler_1);
- g_object_unref (oh->scaler_2);
g_object_unref (oh->timeline);
g_free (oh->hand);
g_free (oh);
diff --git a/src/tests/clutter/interactive/test-paint-wrapper.c
b/src/tests/clutter/interactive/test-paint-wrapper.c
index 8f905cd8b..0c64ce6fc 100644
--- a/src/tests/clutter/interactive/test-paint-wrapper.c
+++ b/src/tests/clutter/interactive/test-paint-wrapper.c
@@ -28,8 +28,6 @@ typedef struct SuperOH
gint stage_height;
gfloat radius;
- ClutterBehaviour *scaler_1;
- ClutterBehaviour *scaler_2;
ClutterTimeline *timeline;
guint frame_id;
@@ -143,16 +141,6 @@ frame_cb (ClutterTimeline *timeline,
}
}
-static gdouble
-my_sine_wave (ClutterAlpha *alpha,
- gpointer dummy G_GNUC_UNUSED)
-{
- ClutterTimeline *timeline = clutter_alpha_get_timeline (alpha);
- gdouble progress = clutter_timeline_get_progress (timeline);
-
- return sin (progress * G_PI);
-}
-
static void
hand_pre_paint (ClutterActor *actor,
gpointer user_data)
@@ -208,7 +196,6 @@ stop_and_quit (ClutterActor *actor,
G_MODULE_EXPORT int
test_paint_wrapper_main (int argc, char *argv[])
{
- ClutterAlpha *alpha;
ClutterActor *stage;
ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
SuperOH *oh;
@@ -260,12 +247,6 @@ test_paint_wrapper_main (int argc, char *argv[])
oh->frame_id =
g_signal_connect (oh->timeline, "new-frame", G_CALLBACK (frame_cb), oh);
- /* Set up some behaviours to handle scaling */
- alpha = clutter_alpha_new_with_func (oh->timeline, my_sine_wave, NULL, NULL);
-
- oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
- oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
-
real_hand = clutter_texture_new_from_file (TESTS_DATADIR
G_DIR_SEPARATOR_S
"redhand.png",
@@ -334,11 +315,6 @@ test_paint_wrapper_main (int argc, char *argv[])
/* Add to our group group */
clutter_container_add_actor (CLUTTER_CONTAINER (oh->group), oh->hand[i]);
-
- if (i % 2)
- clutter_behaviour_apply (oh->scaler_1, oh->hand[i]);
- else
- clutter_behaviour_apply (oh->scaler_2, oh->hand[i]);
}
oh->paint_guards = g_malloc0 (sizeof (gboolean) * n_hands);
@@ -359,8 +335,6 @@ test_paint_wrapper_main (int argc, char *argv[])
clutter_main ();
- g_object_unref (oh->scaler_1);
- g_object_unref (oh->scaler_2);
g_object_unref (oh->timeline);
g_free (oh->paint_guards);
g_free (oh->hand);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]