[mutter] clutter: Remove ClutterTexture
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter: Remove ClutterTexture
- Date: Wed, 13 Nov 2019 14:14:57 +0000 (UTC)
commit b07891750063493b269ad9b80ccf9ec34c59bf09
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Nov 12 19:38:08 2019 +0100
clutter: Remove ClutterTexture
It was deprecated for a long time, and isn't used anymore. Would similar
functionality be needed, use a ClutterContent based approach, such as
ClutterImage.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/932
clutter/clutter/clutter-deprecated.h | 1 -
clutter/clutter/clutter-layout-manager.c | 8 +-
clutter/clutter/clutter-main.c | 6 +-
clutter/clutter/clutter-script.c | 1 -
clutter/clutter/clutter-texture.h | 130 --
clutter/clutter/clutter.h | 1 -
clutter/clutter/deprecated/clutter-texture.c | 2934 --------------------------
clutter/clutter/deprecated/clutter-texture.h | 128 --
clutter/clutter/meson.build | 3 -
9 files changed, 6 insertions(+), 3206 deletions(-)
---
diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h
index 151cdec45..35fbabdca 100644
--- a/clutter/clutter/clutter-deprecated.h
+++ b/clutter/clutter/clutter-deprecated.h
@@ -17,7 +17,6 @@
#include "deprecated/clutter-stage.h"
#include "deprecated/clutter-state.h"
#include "deprecated/clutter-table-layout.h"
-#include "deprecated/clutter-texture.h"
#include "deprecated/clutter-timeline.h"
#undef __CLUTTER_DEPRECATED_H_INSIDE__
diff --git a/clutter/clutter/clutter-layout-manager.c b/clutter/clutter/clutter-layout-manager.c
index 3bb48c5d5..212985521 100644
--- a/clutter/clutter/clutter-layout-manager.c
+++ b/clutter/clutter/clutter-layout-manager.c
@@ -101,8 +101,8 @@
* "layout-manager" : { "type" : "ClutterTableLayout" },
* "children" : [
* {
- * "type" : "ClutterTexture",
- * "filename" : "image-00.png",
+ * "type" : "ClutterText",
+ * "text" : "Some text",
*
* "layout::row" : 0,
* "layout::column" : 0,
@@ -112,8 +112,8 @@
* "layout::y-expand" : true
* },
* {
- * "type" : "ClutterTexture",
- * "filename" : "image-01.png",
+ * "type" : "ClutterText",
+ * "text" : "Some more text",
*
* "layout::row" : 0,
* "layout::column" : 1,
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index c4c24cc50..81847b26f 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -2311,8 +2311,7 @@ clutter_threads_remove_repaint_func (guint handle_id)
* that it does not block, otherwise the frame time budget may be lost.
*
* A repaint function is useful to ensure that an update of the scenegraph
- * is performed before the scenegraph is repainted; for instance, uploading
- * a frame from a video into a #ClutterTexture. By default, a repaint
+ * is performed before the scenegraph is repainted. By default, a repaint
* function added using this function will be invoked prior to the frame
* being processed.
*
@@ -2361,8 +2360,7 @@ clutter_threads_add_repaint_func (GSourceFunc func,
* that it does not block, otherwise the frame time budget may be lost.
*
* A repaint function is useful to ensure that an update of the scenegraph
- * is performed before the scenegraph is repainted; for instance, uploading
- * a frame from a video into a #ClutterTexture. The @flags passed to this
+ * is performed before the scenegraph is repainted. The @flags passed to this
* function will determine the section of the frame processing that will
* result in @func being called.
*
diff --git a/clutter/clutter/clutter-script.c b/clutter/clutter/clutter-script.c
index d8305d0c0..c3221c8f2 100644
--- a/clutter/clutter/clutter-script.c
+++ b/clutter/clutter/clutter-script.c
@@ -175,7 +175,6 @@
#include "clutter-actor.h"
#include "clutter-stage.h"
-#include "clutter-texture.h"
#include "clutter-script.h"
#include "clutter-script-private.h"
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 320fdf7e8..81210819d 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -103,7 +103,6 @@
#include "clutter-stage-manager.h"
#include "clutter-stage-view.h"
#include "clutter-tap-action.h"
-#include "clutter-texture.h"
#include "clutter-text.h"
#include "clutter-timeline.h"
#include "clutter-transition-group.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index ba43724cb..80ac52768 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -77,7 +77,6 @@ clutter_headers = [
'clutter-stage-manager.h',
'clutter-stage-view.h',
'clutter-tap-action.h',
- 'clutter-texture.h',
'clutter-text.h',
'clutter-text-buffer.h',
'clutter-timeline.h',
@@ -232,7 +231,6 @@ clutter_deprecated_headers = [
'deprecated/clutter-stage.h',
'deprecated/clutter-state.h',
'deprecated/clutter-table-layout.h',
- 'deprecated/clutter-texture.h',
'deprecated/clutter-timeline.h',
]
@@ -244,7 +242,6 @@ clutter_deprecated_sources = [
'deprecated/clutter-rectangle.c',
'deprecated/clutter-state.c',
'deprecated/clutter-table-layout.c',
- 'deprecated/clutter-texture.c',
]
clutter_backend_sources = []
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]