[gtk/inspector-trees: 2/2] inspector: Stop using a treeview for css properties
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/inspector-trees: 2/2] inspector: Stop using a treeview for css properties
- Date: Thu, 6 Oct 2022 02:13:49 +0000 (UTC)
commit 7a2c4e8a38b7107f192f0c14572a8051b6f7d19a
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Oct 5 20:58:49 2022 -0400
inspector: Stop using a treeview for css properties
Treeviews are heading towards deprecation.
gtk/inspector/css-node-tree.c | 261 +++++++++++++++++++++++++++++++++++------
gtk/inspector/css-node-tree.ui | 54 ++-------
2 files changed, 237 insertions(+), 78 deletions(-)
---
diff --git a/gtk/inspector/css-node-tree.c b/gtk/inspector/css-node-tree.c
index a5601d7b82..5b57feabbf 100644
--- a/gtk/inspector/css-node-tree.c
+++ b/gtk/inspector/css-node-tree.c
@@ -42,10 +42,131 @@
#include "gtktreeselection.h"
#include "gtktypebuiltins.h"
#include "gtkstack.h"
+#include "gtknoselection.h"
+#include "gtkcolumnview.h"
+#include "gtkcolumnviewcolumn.h"
#include <glib/gi18n-lib.h>
#include <gtk/css/gtkcss.h>
+/* {{{ CssProperty object */
+
+typedef struct _CssProperty CssProperty;
+
+G_DECLARE_FINAL_TYPE (CssProperty, css_property, CSS, PROPERTY, GObject);
+
+struct _CssProperty
+{
+ GObject parent;
+
+ char *name;
+ char *value;
+ char *location;
+};
+
+enum {
+ CSS_PROPERTY_PROP_NAME = 1,
+ CSS_PROPERTY_PROP_VALUE,
+ CSS_PROPERTY_PROP_LOCATION,
+ Css_PROPERTY_NUM_PROPERTIES
+};
+
+G_DEFINE_TYPE (CssProperty, css_property, G_TYPE_OBJECT);
+
+static void
+css_property_init (CssProperty *self)
+{
+}
+
+static void
+css_property_finalize (GObject *object)
+{
+ CssProperty *self = CSS_PROPERTY (object);
+
+ g_free (self->name);
+ g_free (self->value);
+ g_free (self->location);
+
+ G_OBJECT_CLASS (css_property_parent_class)->finalize (object);
+}
+
+static void
+css_property_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ CssProperty *self = CSS_PROPERTY (object);
+
+ switch (property_id)
+ {
+ case CSS_PROPERTY_PROP_NAME:
+ g_value_set_string (value, self->name);
+ break;
+
+ case CSS_PROPERTY_PROP_VALUE:
+ g_value_set_string (value, self->value);
+ break;
+
+ case CSS_PROPERTY_PROP_LOCATION:
+ g_value_set_string (value, self->location);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ break;
+ }
+}
+
+static void
+css_property_class_init (CssPropertyClass *class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GParamSpec *pspec;
+
+ object_class->finalize = css_property_finalize;
+ object_class->get_property = css_property_get_property;
+
+ pspec = g_param_spec_string ("name", NULL, NULL,
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+
+ g_object_class_install_property (object_class, CSS_PROPERTY_PROP_NAME, pspec);
+
+ pspec = g_param_spec_string ("value", NULL, NULL,
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+
+ g_object_class_install_property (object_class, CSS_PROPERTY_PROP_VALUE, pspec);
+
+ pspec = g_param_spec_string ("location", NULL, NULL,
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS);
+
+ g_object_class_install_property (object_class, CSS_PROPERTY_PROP_LOCATION, pspec);
+}
+
+static CssProperty *
+css_property_new (const char *name,
+ const char *value,
+ const char *location)
+{
+ CssProperty *self;
+
+ self = g_object_new (css_property_get_type (), NULL);
+
+ self->name = g_strdup (name);
+ self->value = g_strdup (value);
+ self->location = g_strdup (location);
+
+ return self;
+}
+
+/* }}} */
+
enum {
COLUMN_NODE_NAME,
COLUMN_NODE_VISIBLE,
@@ -56,13 +177,6 @@ enum {
N_NODE_COLUMNS
};
-enum
-{
- COLUMN_PROP_NAME,
- COLUMN_PROP_VALUE,
- COLUMN_PROP_LOCATION
-};
-
enum
{
PROP_0,
@@ -78,10 +192,8 @@ struct _GtkInspectorCssNodeTreePrivate
GtkTreeViewColumn *node_name_column;
GtkTreeViewColumn *node_id_column;
GtkTreeViewColumn *node_classes_column;
- GtkListStore *prop_model;
+ GListStore *prop_model;
GtkWidget *prop_tree;
- GtkTreeViewColumn *prop_name_column;
- GHashTable *prop_iters;
GtkCssNode *node;
};
@@ -218,7 +330,7 @@ gtk_inspector_css_node_tree_finalize (GObject *object)
gtk_inspector_css_node_tree_unset_node (cnt);
- g_hash_table_unref (cnt->priv->prop_iters);
+ g_object_unref (cnt->priv->prop_model);
G_OBJECT_CLASS (gtk_inspector_css_node_tree_parent_class)->finalize (object);
}
@@ -245,9 +357,7 @@ gtk_inspector_css_node_tree_class_init (GtkInspectorCssNodeTreeClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, node_name_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, node_id_column);
gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, node_classes_column);
- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, prop_name_column);
- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, prop_model);
- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, prop_name_column);
+ gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssNodeTree, prop_tree);
gtk_widget_class_bind_template_callback (widget_class, row_activated);
gtk_widget_class_bind_template_callback (widget_class, selection_changed);
@@ -342,11 +452,75 @@ gtk_inspector_css_node_tree_get_node_value (GtkTreeModelCssNode *model,
}
}
+static void
+setup_label (GtkSignalListItemFactory *factory,
+ GtkListItem *list_item)
+{
+ GtkWidget *label;
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.);
+ gtk_list_item_set_child (list_item, label);
+}
+
+static void
+setup_value (GtkSignalListItemFactory *factory,
+ GtkListItem *list_item)
+{
+ GtkWidget *label;
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.);
+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+ gtk_label_set_width_chars (GTK_LABEL (label), 20);
+ gtk_list_item_set_child (list_item, label);
+}
+
+static void
+bind_name (GtkSignalListItemFactory *factory,
+ GtkListItem *list_item)
+{
+ GtkWidget *label;
+ CssProperty *property;
+
+ property = gtk_list_item_get_item (list_item);
+ label = gtk_list_item_get_child (list_item);
+ gtk_label_set_text (GTK_LABEL (label), property->name);
+}
+
+static void
+bind_value (GtkSignalListItemFactory *factory,
+ GtkListItem *list_item)
+{
+ GtkWidget *label;
+ CssProperty *property;
+
+ property = gtk_list_item_get_item (list_item);
+ label = gtk_list_item_get_child (list_item);
+ gtk_label_set_text (GTK_LABEL (label), property->value);
+}
+
+static void
+bind_location (GtkSignalListItemFactory *factory,
+ GtkListItem *list_item)
+{
+ GtkWidget *label;
+ CssProperty *property;
+
+ property = gtk_list_item_get_item (list_item);
+ label = gtk_list_item_get_child (list_item);
+ gtk_label_set_text (GTK_LABEL (label), property->location);
+}
+
static void
gtk_inspector_css_node_tree_init (GtkInspectorCssNodeTree *cnt)
{
GtkInspectorCssNodeTreePrivate *priv;
int i;
+ GtkListItemFactory *factory;
+ GtkColumnViewColumn *column;
+ GtkSorter *sorter;
+ GtkSortListModel *sort_model;
cnt->priv = gtk_inspector_css_node_tree_get_instance_private (cnt);
gtk_widget_init_template (GTK_WIDGET (cnt));
@@ -362,25 +536,51 @@ gtk_inspector_css_node_tree_init (GtkInspectorCssNodeTree *cnt)
gtk_tree_view_set_model (GTK_TREE_VIEW (priv->node_tree), priv->node_model);
g_object_unref (priv->node_model);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (cnt->priv->prop_model),
- COLUMN_PROP_NAME,
- GTK_SORT_ASCENDING);
-
- priv->prop_iters = g_hash_table_new_full (g_str_hash, g_str_equal,
- NULL, (GDestroyNotify) gtk_tree_iter_free);
+ priv->prop_model = g_list_store_new (css_property_get_type ());
+
+ sort_model = gtk_sort_list_model_new (G_LIST_MODEL (priv->prop_model),
+ gtk_column_view_get_sorter (GTK_COLUMN_VIEW (priv->prop_tree)));
+
+ gtk_column_view_set_model (GTK_COLUMN_VIEW (priv->prop_tree),
+ GTK_SELECTION_MODEL (gtk_no_selection_new (G_LIST_MODEL (sort_model))));
+
+ column = g_list_model_get_item (gtk_column_view_get_columns (GTK_COLUMN_VIEW (priv->prop_tree)), 0);
+ factory = gtk_signal_list_item_factory_new ();
+ g_signal_connect (factory, "setup", G_CALLBACK (setup_label), NULL);
+ g_signal_connect (factory, "bind", G_CALLBACK (bind_name), NULL);
+ gtk_column_view_column_set_factory (column, factory);
+ sorter = GTK_SORTER (gtk_string_sorter_new (gtk_property_expression_new (css_property_get_type (), NULL,
"name")));
+ gtk_column_view_column_set_sorter (column, sorter);
+ gtk_column_view_sort_by_column (GTK_COLUMN_VIEW (priv->prop_tree), column, GTK_SORT_ASCENDING);
+ g_object_unref (sorter);
+ g_object_unref (factory);
+ g_object_unref (column);
+
+ column = g_list_model_get_item (gtk_column_view_get_columns (GTK_COLUMN_VIEW (priv->prop_tree)), 1);
+ factory = gtk_signal_list_item_factory_new ();
+ g_signal_connect (factory, "setup", G_CALLBACK (setup_value), NULL);
+ g_signal_connect (factory, "bind", G_CALLBACK (bind_value), NULL);
+ gtk_column_view_column_set_factory (column, factory);
+ g_object_unref (factory);
+ g_object_unref (column);
+
+ column = g_list_model_get_item (gtk_column_view_get_columns (GTK_COLUMN_VIEW (priv->prop_tree)), 2);
+ factory = gtk_signal_list_item_factory_new ();
+ g_signal_connect (factory, "setup", G_CALLBACK (setup_label), NULL);
+ g_signal_connect (factory, "bind", G_CALLBACK (bind_location), NULL);
+ gtk_column_view_column_set_factory (column, factory);
+ g_object_unref (factory);
+ g_object_unref (column);
for (i = 0; i < _gtk_css_style_property_get_n_properties (); i++)
{
GtkCssStyleProperty *prop;
- GtkTreeIter iter;
const char *name;
prop = _gtk_css_style_property_lookup_by_id (i);
name = _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop));
- gtk_list_store_append (cnt->priv->prop_model, &iter);
- gtk_list_store_set (cnt->priv->prop_model, &iter, COLUMN_PROP_NAME, name, -1);
- g_hash_table_insert (cnt->priv->prop_iters, (gpointer)name, gtk_tree_iter_copy (&iter));
+ g_list_store_append (priv->prop_model, css_property_new (name, NULL, NULL));
}
}
@@ -437,16 +637,14 @@ gtk_inspector_css_node_tree_update_style (GtkInspectorCssNodeTree *cnt,
{
GtkCssStyleProperty *prop;
const char *name;
- GtkTreeIter *iter;
GtkCssSection *section;
char *location;
char *value;
+ CssProperty *property;
prop = _gtk_css_style_property_lookup_by_id (i);
name = _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop));
- iter = (GtkTreeIter *)g_hash_table_lookup (priv->prop_iters, name);
-
if (new_style)
{
value = _gtk_css_value_to_string (gtk_css_style_get_value (new_style, i));
@@ -463,11 +661,8 @@ gtk_inspector_css_node_tree_update_style (GtkInspectorCssNodeTree *cnt,
location = NULL;
}
- gtk_list_store_set (priv->prop_model,
- iter,
- COLUMN_PROP_VALUE, value,
- COLUMN_PROP_LOCATION, location,
- -1);
+ property = css_property_new (name, value, location);
+ g_list_store_splice (priv->prop_model, i, 1, (gpointer *)&property, 1);
g_free (location);
g_free (value);
@@ -528,4 +723,4 @@ gtk_inspector_css_node_tree_set_display (GtkInspectorCssNodeTree *cnt,
g_free (theme_name);
}
-// vim: set et sw=2 ts=2:
+/* vim:set foldmethod=marker expandtab: */
diff --git a/gtk/inspector/css-node-tree.ui b/gtk/inspector/css-node-tree.ui
index 38019d7695..e0622d328c 100644
--- a/gtk/inspector/css-node-tree.ui
+++ b/gtk/inspector/css-node-tree.ui
@@ -1,12 +1,4 @@
<interface domain="gtk40">
- <object class="GtkListStore" id="prop_model">
- <columns>
- <column type="gchararray"/>
- <column type="gchararray"/>
- <column type="gchararray"/>
- <column type="gint"/>
- </columns>
- </object>
<template class="GtkInspectorCssNodeTree" parent="GtkBox">
<property name="orientation">vertical</property>
<child>
@@ -94,56 +86,28 @@
<property name="vexpand">1</property>
<property name="min-content-height">100</property>
<child>
- <object class="GtkTreeView" id="prop_tree">
- <property name="model">prop_model</property>
- <property name="search-column">0</property>
- <property name="enable-search">0</property>
- <property name="enable-grid-lines">vertical</property>
+ <object class="GtkColumnView" id="prop_tree">
+ <style>
+ <class name="data-table"/>
+ <class name="list"/>
+ </style>
<child>
- <object class="GtkTreeViewColumn" id="prop_name_column">
+ <object class="GtkColumnViewColumn">
<property name="title" translatable="yes">CSS Property</property>
<property name="resizable">1</property>
- <property name="sort-column-id">0</property>
- <child>
- <object class="GtkCellRendererText">
- <property name="scale">0.8</property>
- </object>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn">
+ <object class="GtkColumnViewColumn">
<property name="title" translatable="yes">Value</property>
<property name="resizable">1</property>
- <child>
- <object class="GtkCellRendererText">
- <property name="scale">0.8</property>
- <property name="width-chars">20</property>
- <property name="ellipsize">end</property>
- </object>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
</object>
</child>
<child>
- <object class="GtkTreeViewColumn">
+ <object class="GtkColumnViewColumn">
<property name="title" translatable="yes">Location</property>
<property name="resizable">1</property>
- <child>
- <object class="GtkCellRendererText">
- <property name="scale">0.8</property>
- <property name="width-chars">20</property>
- <property name="ellipsize">end</property>
- </object>
- <attributes>
- <attribute name="text">2</attribute>
- </attributes>
- </child>
+ <property name="expand">1</property>
</object>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
