summaryrefslogtreecommitdiff
path: root/gtk/inspector
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2016-12-15 04:24:37 +0100
committerBenjamin Otte <otte@redhat.com>2016-12-20 18:01:11 +0100
commitcf520b7a1f932100a0b87e85a4501d56e30762cc (patch)
tree943d59486b451c4bd764b2433bbf68ca391a1989 /gtk/inspector
parent3e26fadb2463c7e44b4b9efbb37c0f55201e59b7 (diff)
downloadgtk+-cf520b7a1f932100a0b87e85a4501d56e30762cc.tar.gz
gsk: Add blend nodes
Implement blend mode support in GTK background compositing with it.
Diffstat (limited to 'gtk/inspector')
-rw-r--r--gtk/inspector/gtktreemodelrendernode.c11
-rw-r--r--gtk/inspector/recorder.c19
2 files changed, 11 insertions, 19 deletions
diff --git a/gtk/inspector/gtktreemodelrendernode.c b/gtk/inspector/gtktreemodelrendernode.c
index ce470ee9df..5426250e0e 100644
--- a/gtk/inspector/gtktreemodelrendernode.c
+++ b/gtk/inspector/gtktreemodelrendernode.c
@@ -19,6 +19,8 @@
#include "gtktreemodelrendernode.h"
+#include "gsk/gskrendernodeprivate.h"
+
typedef struct _TreeElement TreeElement;
/* This is an array of all nodes and the index of their parent. When adding a node,
@@ -542,6 +544,15 @@ append_node (GtkTreeModelRenderNode *nodemodel,
append_node (nodemodel, gsk_rounded_clip_node_get_child (node), priv->nodes->len - 1);
break;
+ case GSK_BLEND_NODE:
+ {
+ int elt_index = priv->nodes->len - 1;
+
+ append_node (nodemodel, gsk_blend_node_get_bottom_child (node), elt_index);
+ append_node (nodemodel, gsk_blend_node_get_top_child (node), elt_index);
+ }
+ break;
+
case GSK_CONTAINER_NODE:
{
gint elt_index;
diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index 1a0f5d1fce..839e828991 100644
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -133,9 +133,7 @@ populate_render_node_properties (GtkListStore *store,
GskRenderNode *node)
{
graphene_rect_t bounds;
- int i;
char *tmp;
- GEnumClass *class;
gtk_list_store_clear (store);
@@ -161,23 +159,6 @@ populate_render_node_properties (GtkListStore *store,
0, "Has Texture",
1, gsk_render_node_get_node_type (node) == GSK_TEXTURE_NODE ? "TRUE" : "FALSE",
-1);
-
- class = g_type_class_ref (gsk_blend_mode_get_type ());
- for (i = 0; i < class->n_values; i++)
- {
- if (class->values[i].value == gsk_render_node_get_blend_mode (node))
- {
- tmp = g_strdup (class->values[i].value_nick);
- break;
- }
- }
- g_type_class_unref (class);
-
- gtk_list_store_insert_with_values (store, NULL, -1,
- 0, "Blendmode",
- 1, tmp,
- -1);
- g_free (tmp);
}
static void