[gnome-builder] plugins: Make the symbol-tree a GObject instead of a GtkWidget
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] plugins: Make the symbol-tree a GObject instead of a GtkWidget
- Date: Tue, 26 Jan 2016 03:09:37 +0000 (UTC)
commit 995a032d90f0f08ea73d8255526fdb37fb33ed32
Author: Mario Sanchez Prada <msanchez gnome org>
Date: Mon Jan 25 10:49:31 2016 +0000
plugins: Make the symbol-tree a GObject instead of a GtkWidget
The ref counting of this extension being a GtkWidget does not work, as
expected, causing crashes whenever it gets disabled since it expects a
GObject and not a floating object like the GtkBox it inherits from.
To fix this issue, this patch onverts the extension into a GObject and
extract the UI code to a new class SymbolTreePanel (subclass of GtkBox).
https://bugzilla.gnome.org/show_bug.cgi?id=761106
plugins/symbol-tree/Makefile.am | 2 +
plugins/symbol-tree/symbol-tree-panel.c | 356 ++++++++++++++++++++
plugins/symbol-tree/symbol-tree-panel.h | 34 ++
.../{symbol-tree.ui => symbol-tree-panel.ui} | 2 +-
plugins/symbol-tree/symbol-tree.c | 337 +-----------------
plugins/symbol-tree/symbol-tree.gresource.xml | 2 +-
plugins/symbol-tree/symbol-tree.h | 4 +-
plugins/symbol-tree/theme/shared.css | 2 +-
8 files changed, 416 insertions(+), 323 deletions(-)
---
diff --git a/plugins/symbol-tree/Makefile.am b/plugins/symbol-tree/Makefile.am
index 9f82958..02a12a6 100644
--- a/plugins/symbol-tree/Makefile.am
+++ b/plugins/symbol-tree/Makefile.am
@@ -12,6 +12,8 @@ dist_plugin_DATA = symbol-tree.plugin
libsymbol_tree_la_SOURCES = \
symbol-tree-builder.c \
symbol-tree-builder.h \
+ symbol-tree-panel.c \
+ symbol-tree-panel.h \
symbol-tree.c \
symbol-tree.h \
$(NULL)
diff --git a/plugins/symbol-tree/symbol-tree-panel.c b/plugins/symbol-tree/symbol-tree-panel.c
new file mode 100644
index 0000000..238e29e
--- /dev/null
+++ b/plugins/symbol-tree/symbol-tree-panel.c
@@ -0,0 +1,356 @@
+/* symbol-tree-panel.c
+ *
+ * Copyright (C) 2016 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/>.
+ */
+
+#include <ide.h>
+
+#include <glib/gi18n.h>
+#include <ide.h>
+
+#include "egg-task-cache.h"
+
+#include "symbol-tree.h"
+#include "symbol-tree-builder.h"
+#include "symbol-tree-panel.h"
+#include "symbol-tree-resources.h"
+
+#define REFRESH_TREE_INTERVAL_MSEC (15 * 1000)
+
+struct _SymbolTreePanel
+{
+ GtkBox parent_instance;
+
+ GCancellable *cancellable;
+ EggTaskCache *symbols_cache;
+ IdeTree *tree;
+ GtkSearchEntry *search_entry;
+
+ IdeBuffer *last_document;
+ gsize last_change_count;
+
+ guint refresh_tree_timeout;
+};
+
+G_DEFINE_TYPE (SymbolTreePanel, symbol_tree_panel, GTK_TYPE_BOX)
+
+static void refresh_tree (SymbolTreePanel *self);
+
+static gboolean
+refresh_tree_timeout (gpointer user_data)
+{
+ SymbolTreePanel *self = user_data;
+ refresh_tree (self);
+ return G_SOURCE_CONTINUE;
+}
+
+static void
+get_cached_symbol_tree_cb (GObject *object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ EggTaskCache *cache = (EggTaskCache *)object;
+ g_autoptr(SymbolTreePanel) self = user_data;
+ g_autoptr(IdeSymbolTree) symbol_tree = NULL;
+ g_autoptr(GError) error = NULL;
+ IdeTreeNode *root;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ IDE_ENTRY;
+
+ g_assert (EGG_IS_TASK_CACHE (cache));
+ g_assert (G_IS_ASYNC_RESULT (result));
+ g_assert (SYMBOL_IS_TREE_PANEL (self));
+
+ if (!(symbol_tree = egg_task_cache_get_finish (cache, result, &error)))
+ {
+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
+ g_warning ("%s", error->message);
+ return;
+ }
+
+ self->refresh_tree_timeout = g_timeout_add (REFRESH_TREE_INTERVAL_MSEC,
+ refresh_tree_timeout,
+ self);
+
+ root = g_object_new (IDE_TYPE_TREE_NODE,
+ "item", symbol_tree,
+ NULL);
+ ide_tree_set_root (self->tree, root);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->tree));
+
+ if (gtk_tree_model_get_iter_first (model, &iter))
+ {
+ do
+ {
+ g_autoptr(IdeTreeNode) node = NULL;
+
+ gtk_tree_model_get (model, &iter, 0, &node, -1);
+ if (node != NULL)
+ ide_tree_node_expand (node, FALSE);
+ }
+ while (gtk_tree_model_iter_next (model, &iter));
+ }
+
+ IDE_EXIT;
+}
+
+static void
+refresh_tree (SymbolTreePanel *self)
+{
+ GtkWidget *active_view;
+ IdePerspective *perspective;
+ IdeWorkbench *workbench;
+ IdeBuffer *document = NULL;
+ gsize change_count = 0;
+
+ IDE_ENTRY;
+
+ g_assert (SYMBOL_IS_TREE_PANEL (self));
+
+ workbench = IDE_WORKBENCH (gtk_widget_get_ancestor (GTK_WIDGET (self), IDE_TYPE_WORKBENCH));
+ if (workbench == NULL)
+ IDE_EXIT;
+
+ perspective = ide_workbench_get_perspective_by_name (workbench, "editor");
+ g_assert (perspective != NULL);
+
+ if ((active_view = ide_layout_get_active_view (IDE_LAYOUT (perspective))) &&
+ IDE_IS_EDITOR_VIEW (active_view))
+ {
+ document = ide_editor_view_get_document (IDE_EDITOR_VIEW (active_view));
+ if (IDE_IS_BUFFER (document))
+ change_count = ide_buffer_get_change_count (IDE_BUFFER (document));
+ }
+
+ if ((document != self->last_document) || (self->last_change_count < change_count))
+ {
+ ide_clear_source (&self->refresh_tree_timeout);
+
+ self->last_document = document;
+ self->last_change_count = change_count;
+
+ /*
+ * Clear the old tree items.
+ *
+ * TODO: Get cross compile names for nodes so that we can
+ * recompute the open state.
+ */
+ ide_tree_set_root (self->tree, ide_tree_node_new ());
+
+ /*
+ * Fetch the symbols via the transparent cache.
+ */
+ if (document != NULL)
+ {
+ if (self->cancellable != NULL)
+ {
+ g_cancellable_cancel (self->cancellable);
+ g_clear_object (&self->cancellable);
+ }
+
+ self->cancellable = g_cancellable_new ();
+
+ egg_task_cache_get_async (self->symbols_cache,
+ document,
+ FALSE,
+ self->cancellable,
+ get_cached_symbol_tree_cb,
+ g_object_ref (self));
+ }
+ }
+
+ IDE_EXIT;
+}
+
+static void
+get_symbol_tree_cb (GObject *object,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ IdeSymbolResolver *resolver = (IdeSymbolResolver *)object;
+ g_autoptr(GTask) task = user_data;
+ g_autoptr(IdeSymbolTree) symbol_tree = NULL;
+ GError *error = NULL;
+
+ IDE_ENTRY;
+
+ g_assert (IDE_IS_SYMBOL_RESOLVER (resolver));
+ g_assert (G_IS_ASYNC_RESULT (result));
+ g_assert (G_IS_TASK (task));
+
+ symbol_tree = ide_symbol_resolver_get_symbol_tree_finish (resolver, result, &error);
+
+ if (!symbol_tree)
+ g_task_return_error (task, error);
+ else
+ g_task_return_pointer (task, g_object_ref (symbol_tree), g_object_unref);
+
+ IDE_EXIT;
+}
+
+static void
+populate_cache_cb (EggTaskCache *cache,
+ gconstpointer key,
+ GTask *task,
+ gpointer user_data)
+{
+ IdeBuffer *document = (IdeBuffer *)key;
+ IdeSymbolResolver *resolver;
+ IdeFile *file;
+
+ IDE_ENTRY;
+
+ g_assert (EGG_IS_TASK_CACHE (cache));
+ g_assert (IDE_IS_BUFFER (document));
+ g_assert (G_IS_TASK (task));
+
+ if ((resolver = ide_buffer_get_symbol_resolver (IDE_BUFFER (document))) &&
+ (file = ide_buffer_get_file (IDE_BUFFER (document))))
+ {
+ ide_symbol_resolver_get_symbol_tree_async (resolver,
+ ide_file_get_file (file),
+ g_task_get_cancellable (task),
+ get_symbol_tree_cb,
+ g_object_ref (task));
+ }
+ else
+ {
+ g_task_return_new_error (task,
+ G_IO_ERROR,
+ G_IO_ERROR_NOT_SUPPORTED,
+ _("Current language does not support symbol resolvers"));
+ }
+
+ IDE_EXIT;
+}
+
+static gboolean
+filter_symbols_cb (IdeTree *tree,
+ IdeTreeNode *node,
+ gpointer user_data)
+{
+ IdePatternSpec *spec = user_data;
+ const gchar *text;
+
+ g_assert (IDE_IS_TREE (tree));
+ g_assert (IDE_IS_TREE_NODE (node));
+ g_assert (spec != NULL);
+
+ if ((text = ide_tree_node_get_text (node)) != NULL)
+ return ide_pattern_spec_match (spec, text);
+
+ return FALSE;
+}
+
+static void
+symbol_tree__search_entry_changed (SymbolTreePanel *self,
+ GtkSearchEntry *search_entry)
+{
+ const gchar *text;
+
+ g_return_if_fail (SYMBOL_IS_TREE (self));
+ g_return_if_fail (GTK_IS_SEARCH_ENTRY (search_entry));
+
+ text = gtk_entry_get_text (GTK_ENTRY (search_entry));
+
+ if (ide_str_empty0 (text))
+ {
+ ide_tree_set_filter (self->tree, NULL, NULL, NULL);
+ }
+ else
+ {
+ IdePatternSpec *spec;
+
+ spec = ide_pattern_spec_new (text);
+ ide_tree_set_filter (self->tree,
+ filter_symbols_cb,
+ spec,
+ (GDestroyNotify)ide_pattern_spec_unref);
+ gtk_tree_view_expand_all (GTK_TREE_VIEW (self->tree));
+ }
+}
+
+static void
+symbol_tree_panel_finalize (GObject *object)
+{
+ SymbolTreePanel *self = (SymbolTreePanel *)object;
+
+ ide_clear_source (&self->refresh_tree_timeout);
+ g_clear_object (&self->cancellable);
+
+ G_OBJECT_CLASS (symbol_tree_panel_parent_class)->finalize (object);
+}
+
+static void
+symbol_tree_panel_class_init (SymbolTreePanelClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->finalize = symbol_tree_panel_finalize;
+
+ gtk_widget_class_set_css_name (widget_class, "symboltreepanel");
+ gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/builder/plugins/symbol-tree/symbol-tree-panel.ui");
+ gtk_widget_class_bind_template_child (widget_class, SymbolTreePanel, tree);
+ gtk_widget_class_bind_template_child (widget_class, SymbolTreePanel, search_entry);
+}
+
+static void
+symbol_tree_panel_init (SymbolTreePanel *self)
+{
+ IdeTreeNode *root;
+ IdeTreeBuilder *builder;
+
+ self->symbols_cache = egg_task_cache_new (g_direct_hash,
+ g_direct_equal,
+ g_object_ref,
+ g_object_unref,
+ g_object_ref,
+ g_object_unref,
+ 20 * 1000L,
+ populate_cache_cb,
+ self,
+ NULL);
+
+ gtk_widget_init_template (GTK_WIDGET (self));
+ gtk_widget_show (GTK_WIDGET (self));
+
+ root = ide_tree_node_new ();
+ ide_tree_set_root (self->tree, root);
+
+ builder = g_object_new (SYMBOL_TYPE_TREE_BUILDER, NULL);
+ ide_tree_add_builder (self->tree, builder);
+
+ g_signal_connect_object (self->search_entry,
+ "changed",
+ G_CALLBACK (symbol_tree__search_entry_changed),
+ self,
+ G_CONNECT_SWAPPED);
+}
+
+void
+symbol_tree_panel_reset (SymbolTreePanel *self)
+{
+ IDE_ENTRY;
+
+ refresh_tree (self);
+ gtk_entry_set_text (GTK_ENTRY (self->search_entry), "");
+
+ IDE_EXIT;
+}
diff --git a/plugins/symbol-tree/symbol-tree-panel.h b/plugins/symbol-tree/symbol-tree-panel.h
new file mode 100644
index 0000000..0a6599c
--- /dev/null
+++ b/plugins/symbol-tree/symbol-tree-panel.h
@@ -0,0 +1,34 @@
+/* symbol-tree-panel.h
+ *
+ * Copyright (C) 2016 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/>.
+ */
+
+#ifndef SYMBOL_TREE_PANEL_H
+#define SYMBOL_TREE_PANEL_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define SYMBOL_TYPE_TREE_PANEL (symbol_tree_panel_get_type())
+
+G_DECLARE_FINAL_TYPE (SymbolTreePanel, symbol_tree_panel, SYMBOL, TREE_PANEL, GtkBox)
+
+void symbol_tree_panel_reset (SymbolTreePanel *self);
+
+G_END_DECLS
+
+#endif /* SYMBOL_TREE_PANEL_H */
diff --git a/plugins/symbol-tree/symbol-tree.ui b/plugins/symbol-tree/symbol-tree-panel.ui
similarity index 94%
rename from plugins/symbol-tree/symbol-tree.ui
rename to plugins/symbol-tree/symbol-tree-panel.ui
index 3c49069..e7f0c3a 100644
--- a/plugins/symbol-tree/symbol-tree.ui
+++ b/plugins/symbol-tree/symbol-tree-panel.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.16 -->
- <template class="SymbolTree" parent="GtkBox">
+ <template class="SymbolTreePanel" parent="GtkBox">
<property name="vexpand">true</property>
<property name="visible">true</property>
<property name="orientation">vertical</property>
diff --git a/plugins/symbol-tree/symbol-tree.c b/plugins/symbol-tree/symbol-tree.c
index 6a9a815..10c3ef2 100644
--- a/plugins/symbol-tree/symbol-tree.c
+++ b/plugins/symbol-tree/symbol-tree.c
@@ -22,166 +22,21 @@
#include <ide.h>
#include <libpeas/peas.h>
-#include "egg-task-cache.h"
-
#include "symbol-tree.h"
-#include "symbol-tree-builder.h"
-#include "symbol-tree-resources.h"
-
-#define REFRESH_TREE_INTERVAL_MSEC (15 * 1000)
+#include "symbol-tree-panel.h"
struct _SymbolTree
{
- GtkBox parent_instance;
-
- GCancellable *cancellable;
- EggTaskCache *symbols_cache;
- IdeTree *tree;
- GtkSearchEntry *search_entry;
-
- IdeBuffer *last_document;
- gsize last_change_count;
-
- guint refresh_tree_timeout;
+ GObject parent_instance;
+ SymbolTreePanel *panel;
};
static void workbench_addin_init (IdeWorkbenchAddinInterface *iface);
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (SymbolTree, symbol_tree, GTK_TYPE_BOX, 0,
+G_DEFINE_DYNAMIC_TYPE_EXTENDED (SymbolTree, symbol_tree, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE_DYNAMIC (IDE_TYPE_WORKBENCH_ADDIN,
workbench_addin_init))
-static void refresh_tree (SymbolTree *symbol_tree);
-
-static gboolean
-refresh_tree_timeout (gpointer user_data)
-{
- SymbolTree *self = user_data;
- refresh_tree (self);
- return G_SOURCE_CONTINUE;
-}
-
-static void
-get_cached_symbol_tree_cb (GObject *object,
- GAsyncResult *result,
- gpointer user_data)
-{
- EggTaskCache *cache = (EggTaskCache *)object;
- g_autoptr(SymbolTree) self = user_data;
- g_autoptr(IdeSymbolTree) symbol_tree = NULL;
- g_autoptr(GError) error = NULL;
- IdeTreeNode *root;
- GtkTreeIter iter;
- GtkTreeModel *model;
-
- IDE_ENTRY;
-
- g_assert (EGG_IS_TASK_CACHE (cache));
- g_assert (G_IS_ASYNC_RESULT (result));
- g_assert (SYMBOL_IS_TREE (self));
-
- if (!(symbol_tree = egg_task_cache_get_finish (cache, result, &error)))
- {
- if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
- g_warning ("%s", error->message);
- return;
- }
-
- self->refresh_tree_timeout = g_timeout_add (REFRESH_TREE_INTERVAL_MSEC,
- refresh_tree_timeout,
- self);
-
- root = g_object_new (IDE_TYPE_TREE_NODE,
- "item", symbol_tree,
- NULL);
- ide_tree_set_root (self->tree, root);
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->tree));
-
- if (gtk_tree_model_get_iter_first (model, &iter))
- {
- do
- {
- g_autoptr(IdeTreeNode) node = NULL;
-
- gtk_tree_model_get (model, &iter, 0, &node, -1);
- if (node != NULL)
- ide_tree_node_expand (node, FALSE);
- }
- while (gtk_tree_model_iter_next (model, &iter));
- }
-
- IDE_EXIT;
-}
-
-static void
-refresh_tree (SymbolTree *self)
-{
- GtkWidget *active_view;
- IdePerspective *perspective;
- IdeWorkbench *workbench;
- IdeBuffer *document = NULL;
- gsize change_count = 0;
-
- IDE_ENTRY;
-
- g_assert (SYMBOL_IS_TREE (self));
-
- workbench = IDE_WORKBENCH (gtk_widget_get_ancestor (GTK_WIDGET (self), IDE_TYPE_WORKBENCH));
- if (workbench == NULL)
- IDE_EXIT;
-
- perspective = ide_workbench_get_perspective_by_name (workbench, "editor");
- g_assert (perspective != NULL);
-
- if ((active_view = ide_layout_get_active_view (IDE_LAYOUT (perspective))) &&
- IDE_IS_EDITOR_VIEW (active_view))
- {
- document = ide_editor_view_get_document (IDE_EDITOR_VIEW (active_view));
- if (IDE_IS_BUFFER (document))
- change_count = ide_buffer_get_change_count (IDE_BUFFER (document));
- }
-
- if ((document != self->last_document) || (self->last_change_count < change_count))
- {
- ide_clear_source (&self->refresh_tree_timeout);
-
- self->last_document = document;
- self->last_change_count = change_count;
-
- /*
- * Clear the old tree items.
- *
- * TODO: Get cross compile names for nodes so that we can
- * recompute the open state.
- */
- ide_tree_set_root (self->tree, ide_tree_node_new ());
-
- /*
- * Fetch the symbols via the transparent cache.
- */
- if (document != NULL)
- {
- if (self->cancellable != NULL)
- {
- g_cancellable_cancel (self->cancellable);
- g_clear_object (&self->cancellable);
- }
-
- self->cancellable = g_cancellable_new ();
-
- egg_task_cache_get_async (self->symbols_cache,
- document,
- FALSE,
- self->cancellable,
- get_cached_symbol_tree_cb,
- g_object_ref (self));
- }
- }
-
- IDE_EXIT;
-}
-
static void
notify_active_view_cb (SymbolTree *self,
GParamFlags *pspec,
@@ -193,70 +48,7 @@ notify_active_view_cb (SymbolTree *self,
g_assert (pspec != NULL);
g_assert (IDE_IS_LAYOUT (layout));
- refresh_tree (self);
- gtk_entry_set_text (GTK_ENTRY (self->search_entry), "");
-
- IDE_EXIT;
-}
-
-static void
-get_symbol_tree_cb (GObject *object,
- GAsyncResult *result,
- gpointer user_data)
-{
- IdeSymbolResolver *resolver = (IdeSymbolResolver *)object;
- g_autoptr(GTask) task = user_data;
- g_autoptr(IdeSymbolTree) symbol_tree = NULL;
- GError *error = NULL;
-
- IDE_ENTRY;
-
- g_assert (IDE_IS_SYMBOL_RESOLVER (resolver));
- g_assert (G_IS_ASYNC_RESULT (result));
- g_assert (G_IS_TASK (task));
-
- symbol_tree = ide_symbol_resolver_get_symbol_tree_finish (resolver, result, &error);
-
- if (!symbol_tree)
- g_task_return_error (task, error);
- else
- g_task_return_pointer (task, g_object_ref (symbol_tree), g_object_unref);
-
- IDE_EXIT;
-}
-
-static void
-populate_cache_cb (EggTaskCache *cache,
- gconstpointer key,
- GTask *task,
- gpointer user_data)
-{
- IdeBuffer *document = (IdeBuffer *)key;
- IdeSymbolResolver *resolver;
- IdeFile *file;
-
- IDE_ENTRY;
-
- g_assert (EGG_IS_TASK_CACHE (cache));
- g_assert (IDE_IS_BUFFER (document));
- g_assert (G_IS_TASK (task));
-
- if ((resolver = ide_buffer_get_symbol_resolver (IDE_BUFFER (document))) &&
- (file = ide_buffer_get_file (IDE_BUFFER (document))))
- {
- ide_symbol_resolver_get_symbol_tree_async (resolver,
- ide_file_get_file (file),
- g_task_get_cancellable (task),
- get_symbol_tree_cb,
- g_object_ref (task));
- }
- else
- {
- g_task_return_new_error (task,
- G_IO_ERROR,
- G_IO_ERROR_NOT_SUPPORTED,
- _("Current language does not support symbol resolvers"));
- }
+ symbol_tree_panel_reset (self->panel);
IDE_EXIT;
}
@@ -285,15 +77,19 @@ symbol_tree_load (IdeWorkbenchAddin *addin,
right_pane = ide_layout_get_right_pane (IDE_LAYOUT (perspective));
g_assert (right_pane != NULL);
+ self->panel = g_object_new (SYMBOL_TYPE_TREE_PANEL, NULL);
+
ide_layout_pane_add_page (IDE_LAYOUT_PANE (right_pane),
- GTK_WIDGET (self),
+ GTK_WIDGET (self->panel),
_("Symbols"),
"lang-function-symbolic");
- gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (self))),
- GTK_WIDGET (self),
+ gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (self->panel))),
+ GTK_WIDGET (self->panel),
"position", 1,
NULL);
+
+ symbol_tree_panel_reset (self->panel);
}
static void
@@ -301,79 +97,21 @@ symbol_tree_unload (IdeWorkbenchAddin *addin,
IdeWorkbench *workbench)
{
SymbolTree *self = (SymbolTree *)addin;
+ IdePerspective *perspective;
+ GtkWidget *pane;
g_assert (SYMBOL_IS_TREE (self));
g_assert (IDE_IS_WORKBENCH (workbench));
- /*
- * TODO: We don't want this to be the addin and the widget added to the pane.
- * It makes object lifecycle difficult to manage. We basically rely
- * on being destroyed right now until we rewrite this (which will happen soon).
- */
-
-#if 0
- workspace = IDE_LAYOUT (ide_workbench_get_workspace (workbench));
- right_pane = ide_workspace_get_right_pane (workspace);
- ide_workspace_pane_remove_page (IDE_LAYOUT_PANE (right_pane), GTK_WIDGET (self));
-#endif
-}
-
-static gboolean
-filter_symbols_cb (IdeTree *tree,
- IdeTreeNode *node,
- gpointer user_data)
-{
- IdePatternSpec *spec = user_data;
- const gchar *text;
-
- g_assert (IDE_IS_TREE (tree));
- g_assert (IDE_IS_TREE_NODE (node));
- g_assert (spec != NULL);
+ perspective = ide_workbench_get_perspective_by_name (workbench, "editor");
+ g_assert (IDE_IS_LAYOUT (perspective));
- if ((text = ide_tree_node_get_text (node)) != NULL)
- return ide_pattern_spec_match (spec, text);
+ pane = ide_layout_get_right_pane (IDE_LAYOUT (perspective));
+ g_assert (IDE_IS_LAYOUT_PANE (pane));
- return FALSE;
+ ide_layout_pane_remove_page (IDE_LAYOUT_PANE (pane), GTK_WIDGET (self->panel));
}
-static void
-symbol_tree__search_entry_changed (SymbolTree *self,
- GtkSearchEntry *search_entry)
-{
- const gchar *text;
-
- g_return_if_fail (SYMBOL_IS_TREE (self));
- g_return_if_fail (GTK_IS_SEARCH_ENTRY (search_entry));
-
- text = gtk_entry_get_text (GTK_ENTRY (search_entry));
-
- if (ide_str_empty0 (text))
- {
- ide_tree_set_filter (self->tree, NULL, NULL, NULL);
- }
- else
- {
- IdePatternSpec *spec;
-
- spec = ide_pattern_spec_new (text);
- ide_tree_set_filter (self->tree,
- filter_symbols_cb,
- spec,
- (GDestroyNotify)ide_pattern_spec_unref);
- gtk_tree_view_expand_all (GTK_TREE_VIEW (self->tree));
- }
-}
-
-static void
-symbol_tree_finalize (GObject *object)
-{
- SymbolTree *self = (SymbolTree *)object;
-
- ide_clear_source (&self->refresh_tree_timeout);
- g_clear_object (&self->cancellable);
-
- G_OBJECT_CLASS (symbol_tree_parent_class)->finalize (object);
-}
static void
workbench_addin_init (IdeWorkbenchAddinInterface *iface)
@@ -385,16 +123,6 @@ workbench_addin_init (IdeWorkbenchAddinInterface *iface)
static void
symbol_tree_class_init (SymbolTreeClass *klass)
{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
- object_class->finalize = symbol_tree_finalize;
-
- gtk_widget_class_set_css_name (widget_class, "symboltree");
- gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/builder/plugins/symbol-tree/symbol-tree.ui");
- gtk_widget_class_bind_template_child (widget_class, SymbolTree, tree);
- gtk_widget_class_bind_template_child (widget_class, SymbolTree, search_entry);
-
g_type_ensure (IDE_TYPE_TREE);
}
@@ -406,33 +134,6 @@ symbol_tree_class_finalize (SymbolTreeClass *klass)
static void
symbol_tree_init (SymbolTree *self)
{
- IdeTreeNode *root;
- IdeTreeBuilder *builder;
-
- self->symbols_cache = egg_task_cache_new (g_direct_hash,
- g_direct_equal,
- g_object_ref,
- g_object_unref,
- g_object_ref,
- g_object_unref,
- 20 * 1000L,
- populate_cache_cb,
- self,
- NULL);
-
- gtk_widget_init_template (GTK_WIDGET (self));
-
- root = ide_tree_node_new ();
- ide_tree_set_root (self->tree, root);
-
- builder = g_object_new (SYMBOL_TYPE_TREE_BUILDER, NULL);
- ide_tree_add_builder (self->tree, builder);
-
- g_signal_connect_object (self->search_entry,
- "changed",
- G_CALLBACK (symbol_tree__search_entry_changed),
- self,
- G_CONNECT_SWAPPED);
}
void
diff --git a/plugins/symbol-tree/symbol-tree.gresource.xml b/plugins/symbol-tree/symbol-tree.gresource.xml
index 8254177..81eb7f1 100644
--- a/plugins/symbol-tree/symbol-tree.gresource.xml
+++ b/plugins/symbol-tree/symbol-tree.gresource.xml
@@ -2,6 +2,6 @@
<gresources>
<gresource prefix="/org/gnome/builder/plugins/symbol-tree">
<file>theme/shared.css</file>
- <file>symbol-tree.ui</file>
+ <file>symbol-tree-panel.ui</file>
</gresource>
</gresources>
diff --git a/plugins/symbol-tree/symbol-tree.h b/plugins/symbol-tree/symbol-tree.h
index f065657..e2e3a4f 100644
--- a/plugins/symbol-tree/symbol-tree.h
+++ b/plugins/symbol-tree/symbol-tree.h
@@ -19,13 +19,13 @@
#ifndef SYMBOL_TREE_H
#define SYMBOL_TREE_H
-#include <gtk/gtk.h>
+#include <glib-object.h>
G_BEGIN_DECLS
#define SYMBOL_TYPE_TREE (symbol_tree_get_type())
-G_DECLARE_FINAL_TYPE (SymbolTree, symbol_tree, SYMBOL, TREE, GtkBox)
+G_DECLARE_FINAL_TYPE (SymbolTree, symbol_tree, SYMBOL, TREE, GObject)
G_END_DECLS
diff --git a/plugins/symbol-tree/theme/shared.css b/plugins/symbol-tree/theme/shared.css
index 95d2770..67f43c6 100644
--- a/plugins/symbol-tree/theme/shared.css
+++ b/plugins/symbol-tree/theme/shared.css
@@ -1,4 +1,4 @@
-symboltree entry {
+symboltreepanel entry {
border-radius: 0;
border-width: 0 0 1px 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
