GNOME.org
 

[gnome-builder] tree: add cell renderer for vcs file status

commit 6862853f7831b342785d4db1aa40c5f5b1d68411
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jun 28 12:41:12 2019 -0700

    tree: add cell renderer for vcs file status

 src/libide/tree/ide-cell-renderer-status.c | 213 +++++++++++++++++++++++++++++
 src/libide/tree/ide-cell-renderer-status.h |  37 +++++
 src/libide/tree/ide-tree-node.c            |  24 ++++
 src/libide/tree/ide-tree-node.h            |  14 ++
 src/libide/tree/ide-tree.c                 |  26 ++++
 src/libide/tree/meson.build                |   6 +-
 6 files changed, 319 insertions(+), 1 deletion(-)
---
diff --git a/src/libide/tree/ide-cell-renderer-status.c b/src/libide/tree/ide-cell-renderer-status.c
new file mode 100644
index 000000000..6c3781e34
--- /dev/null
+++ b/src/libide/tree/ide-cell-renderer-status.c
@@ -0,0 +1,213 @@
+/* ide-cell-renderer-status.c
+ *
+ * Copyright 2019 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#define G_LOG_DOMAIN "ide-cell-renderer-status"
+
+#include "config.h"
+
+#include <math.h>
+
+#include "ide-cell-renderer-status.h"
+
+#define CELL_HEIGHT 16
+#define CELL_WIDTH  16
+
+struct _IdeCellRendererStatus
+{
+  GtkCellRenderer  parent_instance;
+  IdeTreeNodeFlags flags;
+};
+
+enum {
+  PROP_0,
+  PROP_FLAGS,
+  N_PROPS
+};
+
+G_DEFINE_TYPE (IdeCellRendererStatus, ide_cell_renderer_status, GTK_TYPE_CELL_RENDERER)
+
+static GParamSpec *properties [N_PROPS];
+
+static void
+ide_cell_renderer_status_get_preferred_height (GtkCellRenderer *cell,
+                                               GtkWidget       *widget,
+                                               gint            *min_size,
+                                               gint            *nat_size)
+{
+  g_assert (IDE_IS_CELL_RENDERER_STATUS (cell));
+  g_assert (GTK_IS_WIDGET (widget));
+
+  if (min_size)
+    *min_size = CELL_HEIGHT;
+
+  if (nat_size)
+    *nat_size = CELL_HEIGHT;
+}
+
+static void
+ide_cell_renderer_status_get_preferred_width (GtkCellRenderer *cell,
+                                              GtkWidget       *widget,
+                                              gint            *min_size,
+                                              gint            *nat_size)
+{
+  gint xpad;
+
+  g_assert (IDE_IS_CELL_RENDERER_STATUS (cell));
+  g_assert (GTK_IS_WIDGET (widget));
+
+  g_object_get (cell, "xpad", &xpad, NULL);
+
+  if (min_size)
+    *min_size = CELL_WIDTH + xpad;
+
+  if (nat_size)
+    *nat_size = CELL_WIDTH + xpad;
+}
+
+static void
+ide_cell_renderer_status_render (GtkCellRenderer      *cell,
+                                 cairo_t              *cr,
+                                 GtkWidget            *widget,
+                                 const GdkRectangle   *bg_area,
+                                 const GdkRectangle   *cell_area,
+                                 GtkCellRendererState  state)
+{
+  IdeCellRendererStatus *self = (IdeCellRendererStatus *)cell;
+  GtkStyleContext *style_context;
+  GdkRGBA color;
+  gint xpad;
+
+  g_assert (IDE_IS_CELL_RENDERER_STATUS (self));
+  g_assert (cr != NULL);
+  g_assert (GTK_IS_WIDGET (widget));
+  g_assert (bg_area != NULL);
+  g_assert (cell_area != NULL);
+
+  if (self->flags == 0)
+    return;
+
+  style_context = gtk_widget_get_style_context (widget);
+  gtk_style_context_save (style_context);
+
+  if (state & GTK_CELL_RENDERER_SELECTED)
+    gtk_style_context_set_state (style_context,
+                                 gtk_style_context_get_state (style_context) & GTK_STATE_FLAG_SELECTED);
+  gtk_style_context_get_color (style_context,
+                               gtk_style_context_get_state (style_context),
+                               &color);
+  gdk_cairo_set_source_rgba (cr, &color);
+
+  g_object_get (cell, "xpad", &xpad, NULL);
+
+  cairo_arc (cr,
+             cell_area->x + cell_area->width - (CELL_WIDTH/2) - xpad,
+             cell_area->y + (cell_area->height / 2),
+             3,
+             0,
+             M_PI * 2);
+
+  if (self->flags & IDE_TREE_NODE_FLAGS_ADDED)
+    cairo_fill_preserve (cr);
+
+  cairo_stroke (cr);
+
+  gtk_style_context_restore (style_context);
+}
+
+static void
+ide_cell_renderer_status_get_property (GObject    *object,
+                                       guint       prop_id,
+                                       GValue     *value,
+                                       GParamSpec *pspec)
+{
+  IdeCellRendererStatus *self = IDE_CELL_RENDERER_STATUS (object);
+
+  switch (prop_id)
+    {
+    case PROP_FLAGS:
+      g_value_set_uint (value, self->flags);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+ide_cell_renderer_status_set_property (GObject      *object,
+                                       guint         prop_id,
+                                       const GValue *value,
+                                       GParamSpec   *pspec)
+{
+  IdeCellRendererStatus *self = IDE_CELL_RENDERER_STATUS (object);
+
+  switch (prop_id)
+    {
+    case PROP_FLAGS:
+      self->flags = g_value_get_uint (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+ide_cell_renderer_status_class_init (IdeCellRendererStatusClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GtkCellRendererClass *renderer_class = GTK_CELL_RENDERER_CLASS (klass);
+
+  object_class->get_property = ide_cell_renderer_status_get_property;
+  object_class->set_property = ide_cell_renderer_status_set_property;
+
+  renderer_class->get_preferred_height = ide_cell_renderer_status_get_preferred_height;
+  renderer_class->get_preferred_width = ide_cell_renderer_status_get_preferred_width;
+  renderer_class->render = ide_cell_renderer_status_render;
+
+  properties [PROP_FLAGS] =
+    g_param_spec_uint ("flags",
+                       "Flags",
+                       "The flags for the state",
+                       0, G_MAXUINT, 0,
+                       (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  
+  g_object_class_install_properties (object_class, N_PROPS, properties);
+}
+
+static void
+ide_cell_renderer_status_init (IdeCellRendererStatus *self)
+{
+}
+
+GtkCellRenderer *
+ide_cell_renderer_status_new (void)
+{
+  return g_object_new (IDE_TYPE_CELL_RENDERER_STATUS, NULL);
+}
+
+void
+ide_cell_renderer_status_set_flags (IdeCellRendererStatus *self,
+                                    IdeTreeNodeFlags       flags)
+{
+  g_return_if_fail (IDE_IS_CELL_RENDERER_STATUS (self));
+
+  self->flags = flags;
+}
diff --git a/src/libide/tree/ide-cell-renderer-status.h b/src/libide/tree/ide-cell-renderer-status.h
new file mode 100644
index 000000000..1ed489c58
--- /dev/null
+++ b/src/libide/tree/ide-cell-renderer-status.h
@@ -0,0 +1,37 @@
+/* ide-cell-renderer-status.h
+ *
+ * Copyright 2019 Christian Hergert <chergert redhat com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+#pragma once
+
+#include <gtk/gtk.h>
+
+#include "ide-tree-node.h"
+
+G_BEGIN_DECLS
+
+#define IDE_TYPE_CELL_RENDERER_STATUS (ide_cell_renderer_status_get_type())
+
+G_DECLARE_FINAL_TYPE (IdeCellRendererStatus, ide_cell_renderer_status, IDE, CELL_RENDERER_STATUS, 
GtkCellRenderer)
+
+GtkCellRenderer *ide_cell_renderer_status_new       (void);
+void             ide_cell_renderer_status_set_flags (IdeCellRendererStatus *self,
+                                                     IdeTreeNodeFlags       flags);
+
+G_END_DECLS
diff --git a/src/libide/tree/ide-tree-node.c b/src/libide/tree/ide-tree-node.c
index 5d823605d..12499c6c4 100644
--- a/src/libide/tree/ide-tree-node.c
+++ b/src/libide/tree/ide-tree-node.c
@@ -81,6 +81,9 @@ struct _IdeTreeNode
   GdkRGBA      background;
   GdkRGBA      foreground;
 
+  /* Flags for state cell renderer */
+  IdeTreeNodeFlags flags;
+
   /* When did we start loading? This is used to avoid drawing "Loading..."
    * when the tree loads really quickly. Otherwise, we risk looking janky
    * when the loads are quite fast.
@@ -1995,3 +1998,24 @@ ide_tree_node_set_use_markup (IdeTreeNode *self,
       g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_USE_MARKUP]);
     }
 }
+
+IdeTreeNodeFlags
+ide_tree_node_get_flags (IdeTreeNode *self)
+{
+  g_return_val_if_fail (IDE_IS_TREE_NODE (self), 0);
+
+  return self->flags;
+}
+
+void
+ide_tree_node_set_flags (IdeTreeNode      *self,
+                         IdeTreeNodeFlags  flags)
+{
+  g_return_if_fail (IDE_IS_TREE_NODE (self));
+
+  if (self->flags != flags)
+    {
+      self->flags = flags;
+      ide_tree_node_emit_changed (self);
+    }
+}
diff --git a/src/libide/tree/ide-tree-node.h b/src/libide/tree/ide-tree-node.h
index 0aa301b11..eed24d0cf 100644
--- a/src/libide/tree/ide-tree-node.h
+++ b/src/libide/tree/ide-tree-node.h
@@ -36,6 +36,15 @@ typedef enum
   IDE_TREE_NODE_VISIT_CHILDREN = 0x3,
 } IdeTreeNodeVisit;
 
+typedef enum
+{
+  IDE_TREE_NODE_FLAGS_NONE       = 0,
+  IDE_TREE_NODE_FLAGS_DESCENDANT = 1 << 0,
+  IDE_TREE_NODE_FLAGS_ADDED      = 1 << 1,
+  IDE_TREE_NODE_FLAGS_CHANGED    = 1 << 2,
+  IDE_TREE_NODE_FLAGS_REMOVED    = 1 << 3,
+} IdeTreeNodeFlags;
+
 /**
  * IdeTreeTraverseFunc:
  * @node: an #IdeTreeNode
@@ -198,5 +207,10 @@ gboolean       ide_tree_node_get_use_markup         (IdeTreeNode         *self);
 IDE_AVAILABLE_IN_3_32
 void           ide_tree_node_set_use_markup         (IdeTreeNode         *self,
                                                      gboolean             use_markup);
+IDE_AVAILABLE_IN_3_34
+void           ide_tree_node_set_flags              (IdeTreeNode         *self,
+                                                     IdeTreeNodeFlags     flags);
+IDE_AVAILABLE_IN_3_34
+IdeTreeNodeFlags ide_tree_node_get_flags (IdeTreeNode *self);
 
 G_END_DECLS
diff --git a/src/libide/tree/ide-tree.c b/src/libide/tree/ide-tree.c
index 03323e254..0a4838018 100644
--- a/src/libide/tree/ide-tree.c
+++ b/src/libide/tree/ide-tree.c
@@ -26,6 +26,7 @@
 #include <libide-core.h>
 #include <libide-threading.h>
 
+#include "ide-cell-renderer-status.h"
 #include "ide-tree.h"
 #include "ide-tree-model.h"
 #include "ide-tree-node.h"
@@ -118,6 +119,25 @@ ide_tree_select (IdeTree     *self,
   gtk_tree_selection_select_path (selection, path);
 }
 
+static void
+state_cell_func (GtkCellLayout   *layout,
+                 GtkCellRenderer *cell,
+                 GtkTreeModel    *model,
+                 GtkTreeIter     *iter,
+                 gpointer         user_data)
+{
+  IdeTreeNodeFlags flags = 0;
+  IdeTreeNode *node;
+
+  g_assert (IDE_IS_TREE (user_data));
+  g_assert (IDE_IS_TREE_MODEL (model));
+
+  if ((node = ide_tree_model_get_node (IDE_TREE_MODEL (model), iter)))
+    flags = ide_tree_node_get_flags (node);
+
+  ide_cell_renderer_status_set_flags (IDE_CELL_RENDERER_STATUS (cell), flags);
+}
+
 static void
 text_cell_func (GtkCellLayout   *layout,
                 GtkCellRenderer *cell,
@@ -565,6 +585,12 @@ ide_tree_init (IdeTree *self)
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), cell, TRUE);
   gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), cell, text_cell_func, self, NULL);
 
+  cell = g_object_new (IDE_TYPE_CELL_RENDERER_STATUS,
+                       "xpad", 3,
+                       NULL);
+  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), cell, state_cell_func, self, NULL);
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), cell, FALSE);
+
   gtk_tree_view_append_column (GTK_TREE_VIEW (self), column);
 
   priv->dim_label_attributes = pango_attr_list_new ();
diff --git a/src/libide/tree/meson.build b/src/libide/tree/meson.build
index 8e47f196d..b3a21d444 100644
--- a/src/libide/tree/meson.build
+++ b/src/libide/tree/meson.build
@@ -26,7 +26,11 @@ libide_tree_public_sources = [
   'ide-tree-node.c',
 ]
 
-libide_tree_sources = libide_tree_public_sources
+libide_tree_private_sources = [
+  'ide-cell-renderer-status.c',
+]
+
+libide_tree_sources = libide_tree_public_sources + libide_tree_private_sources
 
 #
 # Dependencies
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]