[gnome-builder] build: vendor GdTaggedEntry as IdeTaggedEntry
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: vendor GdTaggedEntry as IdeTaggedEntry
- Date: Sun, 19 Nov 2017 21:57:41 +0000 (UTC)
commit d5b86775e5c13447c48b3e46a126eba6159ead82
Author: Christian Hergert <chergert redhat com>
Date: Sun Nov 19 13:54:59 2017 -0800
build: vendor GdTaggedEntry as IdeTaggedEntry
We were having a number of issues compiling on systems where libgd is
installed (and not the, typically static, libgd from GNOME). We only use
one widget from there anyway, which doesn't really change. So instead, we
can just vendor it and namespace it into libide. This also reduces the
number of private shared libraries we load by one.
Namespace was changed, and availability macros added using the tool at
https://github.com/chergert/add-availability-macros.
https://bugzilla.gnome.org/show_bug.cgi?id=787578
.gitmodules | 3 -
meson.build | 9 -
src/libide/editor/ide-editor-private.h | 1 -
src/libide/editor/ide-editor-search-bar.c | 30 +-
src/libide/editor/ide-editor-search-bar.ui | 2 +-
src/libide/ide.h | 1 +
src/libide/meson.build | 11 +-
src/libide/search/ide-tagged-entry.c | 1242 +++++++++++++++++++++
src/libide/search/ide-tagged-entry.h | 133 +++
src/libide/search/meson.build | 2 +
src/plugins/devhelp/gbp-devhelp-search-private.h | 3 +-
src/plugins/devhelp/gbp-devhelp-search.c | 4 +-
src/plugins/devhelp/gbp-devhelp-search.ui | 2 +-
src/plugins/terminal/gb-terminal-search-private.h | 3 +-
src/plugins/terminal/gb-terminal-search.c | 4 +-
src/plugins/terminal/gb-terminal-search.ui | 2 +-
src/plugins/terminal/gb-terminal-view-private.h | 1 -
subprojects/libgd | 1 -
18 files changed, 1401 insertions(+), 53 deletions(-)
---
diff --git a/meson.build b/meson.build
index ddf1538..9169c8e 100644
--- a/meson.build
+++ b/meson.build
@@ -183,15 +183,6 @@ libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0')
libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.27.2')
libxml2_dep = dependency('libxml-2.0', version: '>=2.9.0')
-libgd = subproject('libgd',
- default_options: [
- 'static=false',
- 'pkglibdir=' + pkglibdir,
- 'with-tagged-entry=true'
- ]
-)
-libgd_dep = libgd.get_variable('libgd_dep')
-
if get_option('with_flatpak') or get_option('with_git')
libgit_dep = dependency('libgit2-glib-1.0', version: '>= 0.25.0')
diff --git a/src/libide/editor/ide-editor-private.h b/src/libide/editor/ide-editor-private.h
index 9238ced..df1a23c 100644
--- a/src/libide/editor/ide-editor-private.h
+++ b/src/libide/editor/ide-editor-private.h
@@ -20,7 +20,6 @@
#include <dazzle.h>
#include <libpeas/peas.h>
-#include <libgd/gd-tagged-entry.h>
#include "editor/ide-editor-perspective.h"
#include "editor/ide-editor-properties.h"
diff --git a/src/libide/editor/ide-editor-search-bar.c b/src/libide/editor/ide-editor-search-bar.c
index cf2662e..3da4775 100644
--- a/src/libide/editor/ide-editor-search-bar.c
+++ b/src/libide/editor/ide-editor-search-bar.c
@@ -20,11 +20,11 @@
#include <dazzle.h>
#include <glib/gi18n.h>
-#include <libgd/gd-tagged-entry.h>
#include "editor/ide-editor-private.h"
#include "editor/ide-editor-search.h"
#include "editor/ide-editor-search-bar.h"
+#include "search/ide-tagged-entry.h"
struct _IdeEditorSearchBar
{
@@ -34,13 +34,13 @@ struct _IdeEditorSearchBar
DzlBindingGroup *search_bindings;
IdeEditorSearch *search;
- GdTaggedEntryTag *search_entry_tag;
+ IdeTaggedEntryTag *search_entry_tag;
GtkCheckButton *case_sensitive;
GtkButton *replace_all_button;
GtkButton *replace_button;
GtkSearchEntry *replace_entry;
- GdTaggedEntry *search_entry;
+ IdeTaggedEntry *search_entry;
GtkGrid *search_options;
GtkCheckButton *use_regex;
GtkCheckButton *whole_word;
@@ -162,7 +162,7 @@ ide_editor_search_bar_grab_focus (GtkWidget *widget)
static void
search_entry_populate_popup (IdeEditorSearchBar *self,
GtkWidget *widget,
- GdTaggedEntry *entry)
+ IdeTaggedEntry *entry)
{
g_assert (IDE_IS_EDITOR_SEARCH_BAR (self));
g_assert (GTK_IS_MENU (widget));
@@ -225,10 +225,10 @@ search_entry_next_match (IdeEditorSearchBar *self,
static void
search_entry_activate (IdeEditorSearchBar *self,
- GdTaggedEntry *entry)
+ IdeTaggedEntry *entry)
{
g_assert (IDE_IS_EDITOR_SEARCH_BAR (self));
- g_assert (GD_IS_TAGGED_ENTRY (entry));
+ g_assert (IDE_IS_TAGGED_ENTRY (entry));
if (self->search != NULL)
{
@@ -242,10 +242,10 @@ search_entry_activate (IdeEditorSearchBar *self,
static void
search_entry_changed (IdeEditorSearchBar *self,
- GdTaggedEntry *entry)
+ IdeTaggedEntry *entry)
{
g_assert (IDE_IS_EDITOR_SEARCH_BAR (self));
- g_assert (GD_IS_TAGGED_ENTRY (entry));
+ g_assert (IDE_IS_TAGGED_ENTRY (entry));
/*
* After the text has been changed, ask the IdeEditorSearch to see if
@@ -309,8 +309,7 @@ update_match_positions (gpointer user_data)
{
if (self->search_entry_tag != NULL)
{
- gd_tagged_entry_remove_tag (self->search_entry,
- self->search_entry_tag);
+ ide_tagged_entry_remove_tag (self->search_entry, self->search_entry_tag);
g_clear_object (&self->search_entry_tag);
}
}
@@ -318,13 +317,12 @@ update_match_positions (gpointer user_data)
{
if (self->search_entry_tag == NULL)
{
- self->search_entry_tag = gd_tagged_entry_tag_new ("");
- gd_tagged_entry_add_tag (self->search_entry, self->search_entry_tag);
- gd_tagged_entry_tag_set_style (self->search_entry_tag,
- "search-occurrences-tag");
+ self->search_entry_tag = ide_tagged_entry_tag_new ("");
+ ide_tagged_entry_add_tag (self->search_entry, self->search_entry_tag);
+ ide_tagged_entry_tag_set_style (self->search_entry_tag, "search-occurrences-tag");
}
- gd_tagged_entry_tag_set_label (self->search_entry_tag, str);
+ ide_tagged_entry_tag_set_label (self->search_entry_tag, str);
}
return G_SOURCE_REMOVE;
@@ -453,8 +451,6 @@ ide_editor_search_bar_class_init (IdeEditorSearchBarClass *klass)
gtk_widget_class_bind_template_child (widget_class, IdeEditorSearchBar, whole_word);
gtk_widget_class_set_css_name (widget_class, "ideeditorsearchbar");
-
- g_type_ensure (GD_TYPE_TAGGED_ENTRY);
}
static void
diff --git a/src/libide/editor/ide-editor-search-bar.ui b/src/libide/editor/ide-editor-search-bar.ui
index 08332db..2b9ef84 100644
--- a/src/libide/editor/ide-editor-search-bar.ui
+++ b/src/libide/editor/ide-editor-search-bar.ui
@@ -16,7 +16,7 @@
<property name="row_spacing">8</property>
<property name="column_spacing">8</property>
<child>
- <object class="GdTaggedEntry" id="search_entry">
+ <object class="IdeTaggedEntry" id="search_entry">
<property name="visible">true</property>
<property name="tag-close-visible">false</property>
<property name="can-focus">true</property>
diff --git a/src/libide/ide.h b/src/libide/ide.h
index 3b94426..091c760 100644
--- a/src/libide/ide.h
+++ b/src/libide/ide.h
@@ -144,6 +144,7 @@ G_BEGIN_DECLS
#include "search/ide-search-provider.h"
#include "search/ide-search-reducer.h"
#include "search/ide-search-result.h"
+#include "search/ide-tagged-entry.h"
#include "snippets/ide-source-snippet-chunk.h"
#include "snippets/ide-source-snippet-context.h"
#include "snippets/ide-source-snippet.h"
diff --git a/src/libide/meson.build b/src/libide/meson.build
index ecfa215..b5fcc8b 100644
--- a/src/libide/meson.build
+++ b/src/libide/meson.build
@@ -194,7 +194,6 @@ endif
install_data('Ide.py', install_dir: pygobject_override_dir)
libide_deps = [
- libgd_dep,
libdazzle_dep,
libgio_dep,
libgiounix_dep,
@@ -228,8 +227,7 @@ libide = shared_library('ide-' + libide_api_version,
libide_dep = declare_dependency(
sources: libide_generated_headers,
- dependencies: [ libgd_dep,
- libdazzle_dep,
+ dependencies: [ libdazzle_dep,
libgio_dep,
libgtk_dep,
libgtksource_dep,
@@ -245,8 +243,7 @@ libide_dep = declare_dependency(
libide_plugin_dep = declare_dependency(
sources: libide_generated_headers,
include_directories: include_directories('.'),
- dependencies: [ libgd_dep,
- libdazzle_dep,
+ dependencies: [ libdazzle_dep,
libgio_dep,
libgtk_dep,
libgtksource_dep,
@@ -272,7 +269,6 @@ libide_gir = gnome.generate_gir(libide,
sources: libide_generated_headers + libide_public_headers + libide_public_sources,
nsversion: libide_api_version,
namespace: 'Ide',
- dependencies: [ libgd_dep ],
symbol_prefix: 'ide',
identifier_prefix: 'Ide',
includes: [ 'Gio-2.0', 'GtkSource-3.0', 'Peas-1.0', 'Dazzle-1.0', 'Json-1.0', 'Template-1.0'],
@@ -302,8 +298,7 @@ libide_vapi = gnome.generate_vapi('libide-' + libide_api_version,
'json-glib-1.0',
'libdazzle-1.0',
'libpeas-1.0',
- 'template-glib-1.0',
- ],
+ 'template-glib-1.0' ],
)
endif
diff --git a/src/libide/search/ide-tagged-entry.c b/src/libide/search/ide-tagged-entry.c
new file mode 100644
index 0000000..6063578
--- /dev/null
+++ b/src/libide/search/ide-tagged-entry.c
@@ -0,0 +1,1242 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2013 Ignacio Casal Quinteiro
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Cosimo Cecchi <cosimoc redhat com>
+ *
+ */
+
+#include "ide-tagged-entry.h"
+
+#include <math.h>
+
+#define BUTTON_INTERNAL_SPACING 6
+
+struct _IdeTaggedEntryTagPrivate {
+ IdeTaggedEntry *entry;
+ GdkWindow *window;
+ PangoLayout *layout;
+
+ gchar *label;
+ gchar *style;
+ gboolean has_close_button;
+
+ cairo_surface_t *close_surface;
+ GtkStateFlags last_button_state;
+};
+
+struct _IdeTaggedEntryPrivate {
+ GList *tags;
+
+ IdeTaggedEntryTag *in_child;
+ gboolean in_child_button;
+ gboolean in_child_active;
+ gboolean in_child_button_active;
+ gboolean button_visible;
+};
+
+enum {
+ SIGNAL_TAG_CLICKED,
+ SIGNAL_TAG_BUTTON_CLICKED,
+ LAST_SIGNAL
+};
+
+enum {
+ PROP_0,
+ PROP_TAG_BUTTON_VISIBLE,
+ NUM_PROPERTIES
+};
+
+enum {
+ PROP_TAG_0,
+ PROP_TAG_LABEL,
+ PROP_TAG_HAS_CLOSE_BUTTON,
+ PROP_TAG_STYLE,
+ NUM_TAG_PROPERTIES
+};
+
+G_DEFINE_TYPE (IdeTaggedEntry, ide_tagged_entry, GTK_TYPE_SEARCH_ENTRY)
+G_DEFINE_TYPE (IdeTaggedEntryTag, ide_tagged_entry_tag, G_TYPE_OBJECT)
+
+static guint signals[LAST_SIGNAL] = { 0, };
+static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
+static GParamSpec *tag_properties[NUM_TAG_PROPERTIES] = { NULL, };
+
+static void ide_tagged_entry_get_text_area_size (GtkEntry *entry,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height);
+static gint ide_tagged_entry_tag_get_width (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry);
+static GtkStyleContext * ide_tagged_entry_tag_get_context (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry);
+
+static void
+ide_tagged_entry_tag_get_margin (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry,
+ GtkBorder *margin)
+{
+ GtkStyleContext *context;
+
+ context = ide_tagged_entry_tag_get_context (tag, entry);
+ gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
+ gtk_style_context_get_margin (context,
+ gtk_style_context_get_state (context),
+ margin);
+ gtk_style_context_restore (context);
+}
+
+static void
+ide_tagged_entry_tag_ensure_close_surface (IdeTaggedEntryTag *tag,
+ GtkStyleContext *context)
+{
+ GtkIconInfo *info;
+ GdkPixbuf *pixbuf;
+ gint icon_size;
+ gint scale_factor;
+
+ if (tag->priv->close_surface != NULL)
+ return;
+
+ gtk_icon_size_lookup (GTK_ICON_SIZE_MENU,
+ &icon_size, NULL);
+ scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (tag->priv->entry));
+
+ info = gtk_icon_theme_lookup_icon_for_scale (gtk_icon_theme_get_default (),
+ "window-close-symbolic",
+ icon_size, scale_factor,
+ GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+
+ /* FIXME: we need a fallback icon in case the icon is not found */
+ pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
+ tag->priv->close_surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale_factor, tag->priv->window);
+
+ g_object_unref (info);
+ g_object_unref (pixbuf);
+}
+
+static gint
+ide_tagged_entry_tag_panel_get_height (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ GtkWidget *widget = GTK_WIDGET (entry);
+ gint height, req_height;
+ GtkRequisition requisition;
+ GtkAllocation allocation;
+ GtkBorder margin;
+
+ gtk_widget_get_allocation (widget, &allocation);
+ gtk_widget_get_preferred_size (widget, &requisition, NULL);
+ ide_tagged_entry_tag_get_margin (tag, entry, &margin);
+
+ /* the tag panel height is the whole entry height, minus the tag margins */
+ req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom
(widget);
+ height = MIN (req_height, allocation.height) - margin.top - margin.bottom;
+
+ return height;
+}
+
+static void
+ide_tagged_entry_tag_panel_get_position (IdeTaggedEntry *self,
+ gint *x_out,
+ gint *y_out)
+{
+ GtkWidget *widget = GTK_WIDGET (self);
+ gint text_x, text_y, text_width, text_height, req_height;
+ GtkAllocation allocation;
+ GtkRequisition requisition;
+
+ gtk_widget_get_allocation (widget, &allocation);
+ gtk_widget_get_preferred_size (widget, &requisition, NULL);
+ req_height = requisition.height - gtk_widget_get_margin_top (widget) - gtk_widget_get_margin_bottom
(widget);
+
+ ide_tagged_entry_get_text_area_size (GTK_ENTRY (self), &text_x, &text_y, &text_width, &text_height);
+
+ /* allocate the panel immediately after the text area */
+ if (x_out)
+ *x_out = allocation.x + text_x + text_width;
+ if (y_out)
+ *y_out = allocation.y + (gint) floor ((allocation.height - req_height) / 2);
+}
+
+static gint
+ide_tagged_entry_tag_panel_get_width (IdeTaggedEntry *self)
+{
+ IdeTaggedEntryTag *tag;
+ gint width;
+ GList *l;
+
+ width = 0;
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ tag = l->data;
+ width += ide_tagged_entry_tag_get_width (tag, self);
+ }
+
+ return width;
+}
+
+static void
+ide_tagged_entry_tag_ensure_layout (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ if (tag->priv->layout != NULL)
+ return;
+
+ tag->priv->layout = pango_layout_new (gtk_widget_get_pango_context (GTK_WIDGET (entry)));
+ pango_layout_set_text (tag->priv->layout, tag->priv->label, -1);
+}
+
+static GtkStateFlags
+ide_tagged_entry_tag_get_state (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ GtkStateFlags state = GTK_STATE_FLAG_NORMAL;
+
+ if (entry->priv->in_child == tag)
+ state |= GTK_STATE_FLAG_PRELIGHT;
+
+ if (entry->priv->in_child_active)
+ state |= GTK_STATE_FLAG_ACTIVE;
+
+ return state;
+}
+
+static GtkStateFlags
+ide_tagged_entry_tag_get_button_state (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ GtkStateFlags state = GTK_STATE_FLAG_NORMAL;
+
+ if (entry->priv->in_child == tag)
+ {
+ if (entry->priv->in_child_button_active)
+ state |= GTK_STATE_FLAG_ACTIVE;
+
+ else if (entry->priv->in_child_button)
+ state |= GTK_STATE_FLAG_PRELIGHT;
+ }
+
+ return state;
+}
+
+static GtkStyleContext *
+ide_tagged_entry_tag_get_context (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ GtkWidget *widget = GTK_WIDGET (entry);
+ GtkStyleContext *retval;
+ GList *l, *list;
+
+ retval = gtk_widget_get_style_context (widget);
+ gtk_style_context_save (retval);
+
+ list = gtk_style_context_list_classes (retval);
+ for (l = list; l; l = l->next)
+ gtk_style_context_remove_class (retval, l->data);
+ g_list_free (list);
+ gtk_style_context_add_class (retval, tag->priv->style);
+
+ return retval;
+}
+
+static gint
+ide_tagged_entry_tag_get_width (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ GtkBorder button_padding, button_border, button_margin;
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ gint layout_width;
+ gint button_width;
+ gint scale_factor;
+
+ ide_tagged_entry_tag_ensure_layout (tag, entry);
+ pango_layout_get_pixel_size (tag->priv->layout, &layout_width, NULL);
+
+ context = ide_tagged_entry_tag_get_context (tag, entry);
+ state = ide_tagged_entry_tag_get_state (tag, entry);
+
+ gtk_style_context_set_state (context, state);
+ gtk_style_context_get_padding (context,
+ gtk_style_context_get_state (context),
+ &button_padding);
+ gtk_style_context_get_border (context,
+ gtk_style_context_get_state (context),
+ &button_border);
+ gtk_style_context_get_margin (context,
+ gtk_style_context_get_state (context),
+ &button_margin);
+
+ ide_tagged_entry_tag_ensure_close_surface (tag, context);
+
+ gtk_style_context_restore (context);
+
+ button_width = 0;
+ if (entry->priv->button_visible && tag->priv->has_close_button)
+ {
+ scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (entry));
+ button_width = cairo_image_surface_get_width (tag->priv->close_surface) / scale_factor +
+ BUTTON_INTERNAL_SPACING;
+ }
+
+ return layout_width + button_padding.left + button_padding.right +
+ button_border.left + button_border.right +
+ button_margin.left + button_margin.right +
+ button_width;
+}
+
+static void
+ide_tagged_entry_tag_get_size (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry,
+ gint *width_out,
+ gint *height_out)
+{
+ gint width, panel_height;
+
+ width = ide_tagged_entry_tag_get_width (tag, entry);
+ panel_height = ide_tagged_entry_tag_panel_get_height (tag, entry);
+
+ if (width_out)
+ *width_out = width;
+ if (height_out)
+ *height_out = panel_height;
+}
+
+static void
+ide_tagged_entry_tag_get_relative_allocations (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry,
+ GtkStyleContext *context,
+ GtkAllocation *background_allocation_out,
+ GtkAllocation *layout_allocation_out,
+ GtkAllocation *button_allocation_out)
+{
+ GtkAllocation background_allocation, layout_allocation, button_allocation;
+ gint width, height, x, y, pix_width, pix_height;
+ gint layout_width, layout_height;
+ gint scale_factor;
+ GtkBorder padding, border;
+ GtkStateFlags state;
+
+ width = gdk_window_get_width (tag->priv->window);
+ height = gdk_window_get_height (tag->priv->window);
+ scale_factor = gdk_window_get_scale_factor (tag->priv->window);
+
+ state = ide_tagged_entry_tag_get_state (tag, entry);
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, state);
+ gtk_style_context_get_margin (context,
+ gtk_style_context_get_state (context),
+ &padding);
+ gtk_style_context_restore (context);
+
+ width -= padding.left + padding.right;
+ height -= padding.top + padding.bottom;
+ x = padding.left;
+ y = padding.top;
+
+ background_allocation.x = x;
+ background_allocation.y = y;
+ background_allocation.width = width;
+ background_allocation.height = height;
+
+ layout_allocation = button_allocation = background_allocation;
+
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, state);
+ gtk_style_context_get_padding (context,
+ gtk_style_context_get_state (context),
+ &padding);
+ gtk_style_context_get_border (context,
+ gtk_style_context_get_state (context),
+ &border);
+ gtk_style_context_restore (context);
+
+ ide_tagged_entry_tag_ensure_layout (tag, entry);
+ pango_layout_get_pixel_size (tag->priv->layout, &layout_width, &layout_height);
+
+ layout_allocation.x += border.left + padding.left;
+ layout_allocation.y += (layout_allocation.height - layout_height) / 2;
+
+ if (entry->priv->button_visible && tag->priv->has_close_button)
+ {
+ pix_width = cairo_image_surface_get_width (tag->priv->close_surface) / scale_factor;
+ pix_height = cairo_image_surface_get_height (tag->priv->close_surface) / scale_factor;
+ }
+ else
+ {
+ pix_width = 0;
+ pix_height = 0;
+ }
+
+ button_allocation.x += width - pix_width - border.right - padding.right;
+ button_allocation.y += (height - pix_height) / 2;
+ button_allocation.width = pix_width;
+ button_allocation.height = pix_height;
+
+ if (background_allocation_out)
+ *background_allocation_out = background_allocation;
+ if (layout_allocation_out)
+ *layout_allocation_out = layout_allocation;
+ if (button_allocation_out)
+ *button_allocation_out = button_allocation;
+}
+
+static gboolean
+ide_tagged_entry_tag_event_is_button (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry,
+ gdouble event_x,
+ gdouble event_y)
+{
+ GtkAllocation button_allocation;
+ GtkStyleContext *context;
+
+ if (!entry->priv->button_visible || !tag->priv->has_close_button)
+ return FALSE;
+
+ context = ide_tagged_entry_tag_get_context (tag, entry);
+ ide_tagged_entry_tag_get_relative_allocations (tag, entry, context, NULL, NULL, &button_allocation);
+
+ gtk_style_context_restore (context);
+
+ /* see if the event falls into the button allocation */
+ if ((event_x >= button_allocation.x &&
+ event_x <= button_allocation.x + button_allocation.width) &&
+ (event_y >= button_allocation.y &&
+ event_y <= button_allocation.y + button_allocation.height))
+ return TRUE;
+
+ return FALSE;
+}
+
+gboolean
+ide_tagged_entry_tag_get_area (IdeTaggedEntryTag *tag,
+ cairo_rectangle_int_t *rect)
+{
+ GtkStyleContext *context;
+ GtkAllocation background_allocation;
+ int window_x, window_y;
+ GtkAllocation alloc;
+
+ g_return_val_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag), FALSE);
+ g_return_val_if_fail (rect != NULL, FALSE);
+
+ gdk_window_get_position (tag->priv->window, &window_x, &window_y);
+ gtk_widget_get_allocation (GTK_WIDGET (tag->priv->entry), &alloc);
+ context = ide_tagged_entry_tag_get_context (tag, tag->priv->entry);
+ ide_tagged_entry_tag_get_relative_allocations (tag, tag->priv->entry, context,
+ &background_allocation,
+ NULL, NULL);
+ gtk_style_context_restore (context);
+
+ rect->x = window_x - alloc.x + background_allocation.x;
+ rect->y = window_y - alloc.y + background_allocation.y;
+ rect->width = background_allocation.width;
+ rect->height = background_allocation.height;
+
+ return TRUE;
+}
+
+static void
+ide_tagged_entry_tag_draw (IdeTaggedEntryTag *tag,
+ cairo_t *cr,
+ IdeTaggedEntry *entry)
+{
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ GtkAllocation background_allocation, layout_allocation, button_allocation;
+
+ context = ide_tagged_entry_tag_get_context (tag, entry);
+ ide_tagged_entry_tag_get_relative_allocations (tag, entry, context,
+ &background_allocation,
+ &layout_allocation,
+ &button_allocation);
+
+ cairo_save (cr);
+ gtk_cairo_transform_to_window (cr, GTK_WIDGET (entry), tag->priv->window);
+
+ gtk_style_context_save (context);
+
+ state = ide_tagged_entry_tag_get_state (tag, entry);
+ gtk_style_context_set_state (context, state);
+ gtk_render_background (context, cr,
+ background_allocation.x, background_allocation.y,
+ background_allocation.width, background_allocation.height);
+ gtk_render_frame (context, cr,
+ background_allocation.x, background_allocation.y,
+ background_allocation.width, background_allocation.height);
+
+ gtk_render_layout (context, cr,
+ layout_allocation.x, layout_allocation.y,
+ tag->priv->layout);
+
+ gtk_style_context_restore (context);
+
+ if (!entry->priv->button_visible || !tag->priv->has_close_button)
+ goto done;
+
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+ state = ide_tagged_entry_tag_get_button_state (tag, entry);
+ gtk_style_context_set_state (context, state);
+
+ /* if the state changed since last time we draw the pixbuf,
+ * clear and redraw it.
+ */
+ if (state != tag->priv->last_button_state)
+ {
+ g_clear_pointer (&tag->priv->close_surface, cairo_surface_destroy);
+ ide_tagged_entry_tag_ensure_close_surface (tag, context);
+
+ tag->priv->last_button_state = state;
+ }
+
+ gtk_render_background (context, cr,
+ button_allocation.x, button_allocation.y,
+ button_allocation.width, button_allocation.height);
+ gtk_render_frame (context, cr,
+ button_allocation.x, button_allocation.y,
+ button_allocation.width, button_allocation.height);
+
+ gtk_render_icon_surface (context, cr,
+ tag->priv->close_surface,
+ button_allocation.x, button_allocation.y);
+
+done:
+ gtk_style_context_restore (context);
+
+ cairo_restore (cr);
+}
+
+static void
+ide_tagged_entry_tag_unrealize (IdeTaggedEntryTag *tag)
+{
+ if (tag->priv->window == NULL)
+ return;
+
+ gdk_window_set_user_data (tag->priv->window, NULL);
+ gdk_window_destroy (tag->priv->window);
+ tag->priv->window = NULL;
+}
+
+static void
+ide_tagged_entry_tag_realize (IdeTaggedEntryTag *tag,
+ IdeTaggedEntry *entry)
+{
+ GtkWidget *widget = GTK_WIDGET (entry);
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+ gint tag_width, tag_height;
+
+ if (tag->priv->window != NULL)
+ return;
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.wclass = GDK_INPUT_ONLY;
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= GDK_BUTTON_PRESS_MASK
+ | GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK
+ | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK;
+
+ ide_tagged_entry_tag_get_size (tag, entry, &tag_width, &tag_height);
+ attributes.x = 0;
+ attributes.y = 0;
+ attributes.width = tag_width;
+ attributes.height = tag_height;
+
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+
+ tag->priv->window = gdk_window_new (gtk_widget_get_window (widget),
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (tag->priv->window, widget);
+}
+
+static gboolean
+ide_tagged_entry_draw (GtkWidget *widget,
+ cairo_t *cr)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+ GList *l;
+
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->draw (widget, cr);
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ tag = l->data;
+ ide_tagged_entry_tag_draw (tag, cr, self);
+ }
+
+ return FALSE;
+}
+
+static void
+ide_tagged_entry_map (GtkWidget *widget)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+ GList *l;
+
+ if (gtk_widget_get_realized (widget) && !gtk_widget_get_mapped (widget))
+ {
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->map (widget);
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ tag = l->data;
+ gdk_window_show (tag->priv->window);
+ }
+ }
+}
+
+static void
+ide_tagged_entry_unmap (GtkWidget *widget)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+ GList *l;
+
+ if (gtk_widget_get_mapped (widget))
+ {
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ tag = l->data;
+ gdk_window_hide (tag->priv->window);
+ }
+
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->unmap (widget);
+ }
+}
+
+static void
+ide_tagged_entry_realize (GtkWidget *widget)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+ GList *l;
+
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->realize (widget);
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ tag = l->data;
+ ide_tagged_entry_tag_realize (tag, self);
+ }
+}
+
+static void
+ide_tagged_entry_unrealize (GtkWidget *widget)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+ GList *l;
+
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->unrealize (widget);
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ tag = l->data;
+ ide_tagged_entry_tag_unrealize (tag);
+ }
+}
+
+static void
+ide_tagged_entry_get_text_area_size (GtkEntry *entry,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (entry);
+ gint tag_panel_width;
+
+ GTK_ENTRY_CLASS (ide_tagged_entry_parent_class)->get_text_area_size (entry, x, y, width, height);
+
+ tag_panel_width = ide_tagged_entry_tag_panel_get_width (self);
+
+ if (width)
+ *width -= tag_panel_width;
+}
+
+static void
+ide_tagged_entry_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ gint x, y, width, height;
+ IdeTaggedEntryTag *tag;
+ GList *l;
+
+ gtk_widget_set_allocation (widget, allocation);
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->size_allocate (widget, allocation);
+
+ if (gtk_widget_get_realized (widget))
+ {
+ ide_tagged_entry_tag_panel_get_position (self, &x, &y);
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ GtkBorder margin;
+
+ tag = l->data;
+ ide_tagged_entry_tag_get_size (tag, self, &width, &height);
+ ide_tagged_entry_tag_get_margin (tag, self, &margin);
+ gdk_window_move_resize (tag->priv->window, x, y + margin.top, width, height);
+
+ x += width;
+ }
+
+ gtk_widget_queue_draw (widget);
+ }
+}
+
+static void
+ide_tagged_entry_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ gint tag_panel_width;
+
+ GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->get_preferred_width (widget, minimum, natural);
+
+ tag_panel_width = ide_tagged_entry_tag_panel_get_width (self);
+
+ if (minimum)
+ *minimum += tag_panel_width;
+ if (natural)
+ *natural += tag_panel_width;
+}
+
+static void
+ide_tagged_entry_finalize (GObject *obj)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (obj);
+
+ if (self->priv->tags != NULL)
+ {
+ g_list_free_full (self->priv->tags, g_object_unref);
+ self->priv->tags = NULL;
+ }
+
+ G_OBJECT_CLASS (ide_tagged_entry_parent_class)->finalize (obj);
+}
+
+static IdeTaggedEntryTag *
+ide_tagged_entry_find_tag_by_window (IdeTaggedEntry *self,
+ GdkWindow *window)
+{
+ IdeTaggedEntryTag *tag = NULL, *elem;
+ GList *l;
+
+ for (l = self->priv->tags; l != NULL; l = l->next)
+ {
+ elem = l->data;
+ if (elem->priv->window == window)
+ {
+ tag = elem;
+ break;
+ }
+ }
+
+ return tag;
+}
+
+static gint
+ide_tagged_entry_enter_notify (GtkWidget *widget,
+ GdkEventCrossing *event)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+
+ tag = ide_tagged_entry_find_tag_by_window (self, event->window);
+
+ if (tag != NULL)
+ {
+ self->priv->in_child = tag;
+ gtk_widget_queue_draw (widget);
+ }
+
+ return GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->enter_notify_event (widget, event);
+}
+
+static gint
+ide_tagged_entry_leave_notify (GtkWidget *widget,
+ GdkEventCrossing *event)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+
+ if (self->priv->in_child != NULL)
+ {
+ self->priv->in_child = NULL;
+ gtk_widget_queue_draw (widget);
+ }
+
+ return GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->leave_notify_event (widget, event);
+}
+
+static gint
+ide_tagged_entry_motion_notify (GtkWidget *widget,
+ GdkEventMotion *event)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+
+ tag = ide_tagged_entry_find_tag_by_window (self, event->window);
+
+ if (tag != NULL)
+ {
+ gdk_event_request_motions (event);
+
+ self->priv->in_child = tag;
+ self->priv->in_child_button = ide_tagged_entry_tag_event_is_button (tag, self, event->x, event->y);
+ gtk_widget_queue_draw (widget);
+
+ return FALSE;
+ }
+
+ return GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->motion_notify_event (widget, event);
+}
+
+static gboolean
+ide_tagged_entry_button_release_event (GtkWidget *widget,
+ GdkEventButton *event)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+
+ tag = ide_tagged_entry_find_tag_by_window (self, event->window);
+
+ if (tag != NULL)
+ {
+ self->priv->in_child_active = FALSE;
+
+ if (ide_tagged_entry_tag_event_is_button (tag, self, event->x, event->y))
+ {
+ self->priv->in_child_button_active = FALSE;
+ g_signal_emit (self, signals[SIGNAL_TAG_BUTTON_CLICKED], 0, tag);
+ }
+ else
+ {
+ g_signal_emit (self, signals[SIGNAL_TAG_CLICKED], 0, tag);
+ }
+
+ gtk_widget_queue_draw (widget);
+
+ return TRUE;
+ }
+
+ return GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->button_release_event (widget, event);
+}
+
+static gboolean
+ide_tagged_entry_button_press_event (GtkWidget *widget,
+ GdkEventButton *event)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (widget);
+ IdeTaggedEntryTag *tag;
+
+ tag = ide_tagged_entry_find_tag_by_window (self, event->window);
+
+ if (tag != NULL)
+ {
+ if (ide_tagged_entry_tag_event_is_button (tag, self, event->x, event->y))
+ self->priv->in_child_button_active = TRUE;
+ else
+ self->priv->in_child_active = TRUE;
+
+ gtk_widget_queue_draw (widget);
+
+ return TRUE;
+ }
+
+ return GTK_WIDGET_CLASS (ide_tagged_entry_parent_class)->button_press_event (widget, event);
+}
+
+static void
+ide_tagged_entry_init (IdeTaggedEntry *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, IDE_TYPE_TAGGED_ENTRY, IdeTaggedEntryPrivate);
+ self->priv->button_visible = TRUE;
+}
+
+static void
+ide_tagged_entry_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (object);
+
+ switch (property_id)
+ {
+ case PROP_TAG_BUTTON_VISIBLE:
+ g_value_set_boolean (value, ide_tagged_entry_get_tag_button_visible (self));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+ide_tagged_entry_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ IdeTaggedEntry *self = IDE_TAGGED_ENTRY (object);
+
+ switch (property_id)
+ {
+ case PROP_TAG_BUTTON_VISIBLE:
+ ide_tagged_entry_set_tag_button_visible (self, g_value_get_boolean (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+ide_tagged_entry_class_init (IdeTaggedEntryClass *klass)
+{
+ GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass);
+ GtkEntryClass *eclass = GTK_ENTRY_CLASS (klass);
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+ oclass->finalize = ide_tagged_entry_finalize;
+ oclass->set_property = ide_tagged_entry_set_property;
+ oclass->get_property = ide_tagged_entry_get_property;
+
+ wclass->realize = ide_tagged_entry_realize;
+ wclass->unrealize = ide_tagged_entry_unrealize;
+ wclass->map = ide_tagged_entry_map;
+ wclass->unmap = ide_tagged_entry_unmap;
+ wclass->size_allocate = ide_tagged_entry_size_allocate;
+ wclass->get_preferred_width = ide_tagged_entry_get_preferred_width;
+ wclass->draw = ide_tagged_entry_draw;
+ wclass->enter_notify_event = ide_tagged_entry_enter_notify;
+ wclass->leave_notify_event = ide_tagged_entry_leave_notify;
+ wclass->motion_notify_event = ide_tagged_entry_motion_notify;
+ wclass->button_press_event = ide_tagged_entry_button_press_event;
+ wclass->button_release_event = ide_tagged_entry_button_release_event;
+
+ eclass->get_text_area_size = ide_tagged_entry_get_text_area_size;
+
+ signals[SIGNAL_TAG_CLICKED] =
+ g_signal_new ("tag-clicked",
+ IDE_TYPE_TAGGED_ENTRY,
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 1, IDE_TYPE_TAGGED_ENTRY_TAG);
+ signals[SIGNAL_TAG_BUTTON_CLICKED] =
+ g_signal_new ("tag-button-clicked",
+ IDE_TYPE_TAGGED_ENTRY,
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE,
+ 1, IDE_TYPE_TAGGED_ENTRY_TAG);
+
+ properties[PROP_TAG_BUTTON_VISIBLE] =
+ g_param_spec_boolean ("tag-close-visible", "Tag close icon visibility",
+ "Whether the close button should be shown in tags.", TRUE,
+ G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);
+
+ g_type_class_add_private (klass, sizeof (IdeTaggedEntryPrivate));
+ g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
+}
+
+static void
+ide_tagged_entry_tag_init (IdeTaggedEntryTag *self)
+{
+ IdeTaggedEntryTagPrivate *priv;
+
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, IDE_TYPE_TAGGED_ENTRY_TAG, IdeTaggedEntryTagPrivate);
+ priv = self->priv;
+
+ priv->last_button_state = GTK_STATE_FLAG_NORMAL;
+}
+
+static void
+ide_tagged_entry_tag_finalize (GObject *obj)
+{
+ IdeTaggedEntryTag *tag = IDE_TAGGED_ENTRY_TAG (obj);
+ IdeTaggedEntryTagPrivate *priv = tag->priv;
+
+ if (priv->window != NULL)
+ ide_tagged_entry_tag_unrealize (tag);
+
+ g_clear_object (&priv->layout);
+ g_clear_pointer (&priv->close_surface, cairo_surface_destroy);
+ g_free (priv->label);
+ g_free (priv->style);
+
+ G_OBJECT_CLASS (ide_tagged_entry_tag_parent_class)->finalize (obj);
+}
+
+static void
+ide_tagged_entry_tag_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ IdeTaggedEntryTag *self = IDE_TAGGED_ENTRY_TAG (object);
+
+ switch (property_id)
+ {
+ case PROP_TAG_LABEL:
+ g_value_set_string (value, ide_tagged_entry_tag_get_label (self));
+ break;
+ case PROP_TAG_HAS_CLOSE_BUTTON:
+ g_value_set_boolean (value, ide_tagged_entry_tag_get_has_close_button (self));
+ break;
+ case PROP_TAG_STYLE:
+ g_value_set_string (value, ide_tagged_entry_tag_get_style (self));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+ide_tagged_entry_tag_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ IdeTaggedEntryTag *self = IDE_TAGGED_ENTRY_TAG (object);
+
+ switch (property_id)
+ {
+ case PROP_TAG_LABEL:
+ ide_tagged_entry_tag_set_label (self, g_value_get_string (value));
+ break;
+ case PROP_TAG_HAS_CLOSE_BUTTON:
+ ide_tagged_entry_tag_set_has_close_button (self, g_value_get_boolean (value));
+ break;
+ case PROP_TAG_STYLE:
+ ide_tagged_entry_tag_set_style (self, g_value_get_string (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ }
+}
+
+static void
+ide_tagged_entry_tag_class_init (IdeTaggedEntryTagClass *klass)
+{
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+ oclass->finalize = ide_tagged_entry_tag_finalize;
+ oclass->set_property = ide_tagged_entry_tag_set_property;
+ oclass->get_property = ide_tagged_entry_tag_get_property;
+
+ tag_properties[PROP_TAG_LABEL] =
+ g_param_spec_string ("label", "Label",
+ "Text to show on the tag.", NULL,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ tag_properties[PROP_TAG_HAS_CLOSE_BUTTON] =
+ g_param_spec_boolean ("has-close-button", "Tag has a close button",
+ "Whether the tag has a close button.", TRUE,
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+ tag_properties[PROP_TAG_STYLE] =
+ g_param_spec_string ("style", "Style",
+ "Style of the tag.", "entry-tag",
+ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+ g_type_class_add_private (klass, sizeof (IdeTaggedEntryTagPrivate));
+ g_object_class_install_properties (oclass, NUM_TAG_PROPERTIES, tag_properties);
+}
+
+IdeTaggedEntry *
+ide_tagged_entry_new (void)
+{
+ return g_object_new (IDE_TYPE_TAGGED_ENTRY, NULL);
+}
+
+gboolean
+ide_tagged_entry_insert_tag (IdeTaggedEntry *self,
+ IdeTaggedEntryTag *tag,
+ gint position)
+{
+ if (g_list_find (self->priv->tags, tag) != NULL)
+ return FALSE;
+
+ tag->priv->entry = self;
+
+ self->priv->tags = g_list_insert (self->priv->tags, g_object_ref (tag), position);
+
+ if (gtk_widget_get_realized (GTK_WIDGET (self)))
+ ide_tagged_entry_tag_realize (tag, self);
+
+ if (gtk_widget_get_mapped (GTK_WIDGET (self)))
+ gdk_window_show_unraised (tag->priv->window);
+
+ gtk_widget_queue_resize (GTK_WIDGET (self));
+
+ return TRUE;
+}
+
+gboolean
+ide_tagged_entry_add_tag (IdeTaggedEntry *self,
+ IdeTaggedEntryTag *tag)
+{
+ return ide_tagged_entry_insert_tag (self, tag, -1);
+}
+
+gboolean
+ide_tagged_entry_remove_tag (IdeTaggedEntry *self,
+ IdeTaggedEntryTag *tag)
+{
+ if (!g_list_find (self->priv->tags, tag))
+ return FALSE;
+
+ ide_tagged_entry_tag_unrealize (tag);
+
+ self->priv->tags = g_list_remove (self->priv->tags, tag);
+ g_object_unref (tag);
+
+ gtk_widget_queue_resize (GTK_WIDGET (self));
+
+ return TRUE;
+}
+
+IdeTaggedEntryTag *
+ide_tagged_entry_tag_new (const gchar *label)
+{
+ return g_object_new (IDE_TYPE_TAGGED_ENTRY_TAG, "label", label, NULL);
+}
+
+void
+ide_tagged_entry_tag_set_label (IdeTaggedEntryTag *tag,
+ const gchar *label)
+{
+ IdeTaggedEntryTagPrivate *priv;
+
+ g_return_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag));
+
+ priv = tag->priv;
+
+ if (g_strcmp0 (priv->label, label) != 0)
+ {
+ GtkWidget *entry;
+
+ g_free (priv->label);
+ priv->label = g_strdup (label);
+ g_clear_object (&priv->layout);
+
+ entry = GTK_WIDGET (tag->priv->entry);
+ if (entry)
+ gtk_widget_queue_resize (entry);
+ }
+}
+
+const gchar *
+ide_tagged_entry_tag_get_label (IdeTaggedEntryTag *tag)
+{
+ g_return_val_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag), NULL);
+
+ return tag->priv->label;
+}
+
+void
+ide_tagged_entry_tag_set_has_close_button (IdeTaggedEntryTag *tag,
+ gboolean has_close_button)
+{
+ IdeTaggedEntryTagPrivate *priv;
+
+ g_return_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag));
+
+ priv = tag->priv;
+
+ has_close_button = has_close_button != FALSE;
+ if (priv->has_close_button != has_close_button)
+ {
+ GtkWidget *entry;
+
+ priv->has_close_button = has_close_button;
+ g_clear_object (&priv->layout);
+
+ entry = GTK_WIDGET (priv->entry);
+ if (entry)
+ gtk_widget_queue_resize (entry);
+ }
+}
+
+gboolean
+ide_tagged_entry_tag_get_has_close_button (IdeTaggedEntryTag *tag)
+{
+ g_return_val_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag), FALSE);
+
+ return tag->priv->has_close_button;
+}
+
+void
+ide_tagged_entry_tag_set_style (IdeTaggedEntryTag *tag,
+ const gchar *style)
+{
+ IdeTaggedEntryTagPrivate *priv;
+
+ g_return_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag));
+
+ priv = tag->priv;
+
+ if (g_strcmp0 (priv->style, style) != 0)
+ {
+ GtkWidget *entry;
+
+ g_free (priv->style);
+ priv->style = g_strdup (style);
+ g_clear_object (&priv->layout);
+
+ entry = GTK_WIDGET (tag->priv->entry);
+ if (entry)
+ gtk_widget_queue_resize (entry);
+ }
+}
+
+const gchar *
+ide_tagged_entry_tag_get_style (IdeTaggedEntryTag *tag)
+{
+ g_return_val_if_fail (IDE_IS_TAGGED_ENTRY_TAG (tag), NULL);
+
+ return tag->priv->style;
+}
+
+void
+ide_tagged_entry_set_tag_button_visible (IdeTaggedEntry *self,
+ gboolean visible)
+{
+ g_return_if_fail (IDE_IS_TAGGED_ENTRY (self));
+
+ if (self->priv->button_visible == visible)
+ return;
+
+ self->priv->button_visible = visible;
+ gtk_widget_queue_resize (GTK_WIDGET (self));
+
+ g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TAG_BUTTON_VISIBLE]);
+}
+
+gboolean
+ide_tagged_entry_get_tag_button_visible (IdeTaggedEntry *self)
+{
+ g_return_val_if_fail (IDE_IS_TAGGED_ENTRY (self), FALSE);
+
+ return self->priv->button_visible;
+}
diff --git a/src/libide/search/ide-tagged-entry.h b/src/libide/search/ide-tagged-entry.h
new file mode 100644
index 0000000..3cd466a
--- /dev/null
+++ b/src/libide/search/ide-tagged-entry.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2013 Ignacio Casal Quinteiro
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Cosimo Cecchi <cosimoc redhat com>
+ *
+ */
+
+#ifndef __IDE_TAGGED_ENTRY_H__
+#define __IDE_TAGGED_ENTRY_H__
+
+#include <gtk/gtk.h>
+
+#include "ide-version-macros.h"
+
+G_BEGIN_DECLS
+
+#define IDE_TYPE_TAGGED_ENTRY ide_tagged_entry_get_type()
+#define IDE_TAGGED_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IDE_TYPE_TAGGED_ENTRY, IdeTaggedEntry))
+#define IDE_TAGGED_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IDE_TYPE_TAGGED_ENTRY,
IdeTaggedEntryClass))
+#define IDE_IS_TAGGED_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IDE_TYPE_TAGGED_ENTRY))
+#define IDE_IS_TAGGED_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IDE_TYPE_TAGGED_ENTRY))
+#define IDE_TAGGED_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IDE_TYPE_TAGGED_ENTRY,
IdeTaggedEntryClass))
+
+typedef struct _IdeTaggedEntry IdeTaggedEntry;
+typedef struct _IdeTaggedEntryClass IdeTaggedEntryClass;
+typedef struct _IdeTaggedEntryPrivate IdeTaggedEntryPrivate;
+
+typedef struct _IdeTaggedEntryTag IdeTaggedEntryTag;
+typedef struct _IdeTaggedEntryTagClass IdeTaggedEntryTagClass;
+typedef struct _IdeTaggedEntryTagPrivate IdeTaggedEntryTagPrivate;
+
+struct _IdeTaggedEntry
+{
+ GtkSearchEntry parent;
+
+ IdeTaggedEntryPrivate *priv;
+};
+
+struct _IdeTaggedEntryClass
+{
+ GtkSearchEntryClass parent_class;
+};
+
+#define IDE_TYPE_TAGGED_ENTRY_TAG ide_tagged_entry_tag_get_type()
+#define IDE_TAGGED_ENTRY_TAG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IDE_TYPE_TAGGED_ENTRY_TAG,
IdeTaggedEntryTag))
+#define IDE_TAGGED_ENTRY_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IDE_TYPE_TAGGED_ENTRY_TAG,
IdeTaggedEntryTagClass))
+#define IDE_IS_TAGGED_ENTRY_TAG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IDE_TYPE_TAGGED_ENTRY_TAG))
+#define IDE_IS_TAGGED_ENTRY_TAG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IDE_TYPE_TAGGED_ENTRY_TAG))
+#define IDE_TAGGED_ENTRY_TAG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IDE_TYPE_TAGGED_ENTRY_TAG,
IdeTaggedEntryTagClass))
+
+struct _IdeTaggedEntryTag
+{
+ GObject parent;
+
+ IdeTaggedEntryTagPrivate *priv;
+};
+
+struct _IdeTaggedEntryTagClass
+{
+ GObjectClass parent_class;
+};
+
+IDE_AVAILABLE_IN_3_28
+GType ide_tagged_entry_get_type (void) G_GNUC_CONST;
+
+IDE_AVAILABLE_IN_3_28
+IdeTaggedEntry *ide_tagged_entry_new (void);
+
+IDE_AVAILABLE_IN_3_28
+void ide_tagged_entry_set_tag_button_visible (IdeTaggedEntry *self,
+ gboolean visible);
+IDE_AVAILABLE_IN_3_28
+gboolean ide_tagged_entry_get_tag_button_visible (IdeTaggedEntry *self);
+
+IDE_AVAILABLE_IN_3_28
+gboolean ide_tagged_entry_insert_tag (IdeTaggedEntry *self,
+ IdeTaggedEntryTag *tag,
+ gint position);
+
+IDE_AVAILABLE_IN_3_28
+gboolean ide_tagged_entry_add_tag (IdeTaggedEntry *self,
+ IdeTaggedEntryTag *tag);
+
+IDE_AVAILABLE_IN_3_28
+gboolean ide_tagged_entry_remove_tag (IdeTaggedEntry *self,
+ IdeTaggedEntryTag *tag);
+
+IDE_AVAILABLE_IN_3_28
+GType ide_tagged_entry_tag_get_type (void) G_GNUC_CONST;
+
+IDE_AVAILABLE_IN_3_28
+IdeTaggedEntryTag *ide_tagged_entry_tag_new (const gchar *label);
+
+IDE_AVAILABLE_IN_3_28
+void ide_tagged_entry_tag_set_label (IdeTaggedEntryTag *tag,
+ const gchar *label);
+IDE_AVAILABLE_IN_3_28
+const gchar *ide_tagged_entry_tag_get_label (IdeTaggedEntryTag *tag);
+
+IDE_AVAILABLE_IN_3_28
+void ide_tagged_entry_tag_set_has_close_button (IdeTaggedEntryTag *tag,
+ gboolean has_close_button);
+IDE_AVAILABLE_IN_3_28
+gboolean ide_tagged_entry_tag_get_has_close_button (IdeTaggedEntryTag *tag);
+
+IDE_AVAILABLE_IN_3_28
+void ide_tagged_entry_tag_set_style (IdeTaggedEntryTag *tag,
+ const gchar *style);
+IDE_AVAILABLE_IN_3_28
+const gchar *ide_tagged_entry_tag_get_style (IdeTaggedEntryTag *tag);
+
+IDE_AVAILABLE_IN_3_28
+gboolean ide_tagged_entry_tag_get_area (IdeTaggedEntryTag *tag,
+ cairo_rectangle_int_t *rect);
+
+G_END_DECLS
+
+#endif /* __IDE_TAGGED_ENTRY_H__ */
diff --git a/src/libide/search/meson.build b/src/libide/search/meson.build
index 99db96e..967ceac 100644
--- a/src/libide/search/meson.build
+++ b/src/libide/search/meson.build
@@ -4,6 +4,7 @@ search_headers = [
'ide-search-provider.h',
'ide-search-result.h',
'ide-search-reducer.h',
+ 'ide-tagged-entry.h',
]
search_sources = [
@@ -12,6 +13,7 @@ search_sources = [
'ide-search-provider.c',
'ide-search-result.c',
'ide-search-reducer.c',
+ 'ide-tagged-entry.c',
]
libide_public_headers += files(search_headers)
diff --git a/src/plugins/devhelp/gbp-devhelp-search-private.h
b/src/plugins/devhelp/gbp-devhelp-search-private.h
index cf6de41..19a2fba 100644
--- a/src/plugins/devhelp/gbp-devhelp-search-private.h
+++ b/src/plugins/devhelp/gbp-devhelp-search-private.h
@@ -18,7 +18,6 @@
#pragma once
-#include <libgd/gd.h>
#include <ide.h>
G_BEGIN_DECLS
@@ -32,7 +31,7 @@ struct _GbpDevhelpSearch
GtkRevealer *search_revealer;
- GdTaggedEntry *search_entry;
+ IdeTaggedEntry *search_entry;
GtkButton *search_prev_button;
GtkButton *search_next_button;
diff --git a/src/plugins/devhelp/gbp-devhelp-search.c b/src/plugins/devhelp/gbp-devhelp-search.c
index 16387a7..dde4aef 100644
--- a/src/plugins/devhelp/gbp-devhelp-search.c
+++ b/src/plugins/devhelp/gbp-devhelp-search.c
@@ -52,7 +52,7 @@ search_button_clicked_cb (GtkButton *button,
}
static void
-search_text_changed_cb (GdTaggedEntry *search_entry,
+search_text_changed_cb (IdeTaggedEntry *search_entry,
GbpDevhelpSearch *self)
{
const char *search_text;
@@ -100,8 +100,6 @@ gbp_devhelp_search_class_init (GbpDevhelpSearchClass *klass)
gtk_widget_class_bind_template_child (widget_class, GbpDevhelpSearch, close_button);
gtk_widget_class_bind_template_child (widget_class, GbpDevhelpSearch, search_entry);
gtk_widget_class_bind_template_child (widget_class, GbpDevhelpSearch, search_revealer);
-
- g_type_ensure (GD_TYPE_TAGGED_ENTRY);
}
static void
diff --git a/src/plugins/devhelp/gbp-devhelp-search.ui b/src/plugins/devhelp/gbp-devhelp-search.ui
index b51ace0..5f690fd 100644
--- a/src/plugins/devhelp/gbp-devhelp-search.ui
+++ b/src/plugins/devhelp/gbp-devhelp-search.ui
@@ -18,7 +18,7 @@
<property name="row_spacing">8</property>
<property name="column_spacing">8</property>
<child>
- <object class="GdTaggedEntry" id="search_entry">
+ <object class="IdeTaggedEntry" id="search_entry">
<property name="visible">true</property>
<property name="can_focus">true</property>
<property name="width-chars">20</property>
diff --git a/src/plugins/terminal/gb-terminal-search-private.h
b/src/plugins/terminal/gb-terminal-search-private.h
index a85364f..6ef6e26 100644
--- a/src/plugins/terminal/gb-terminal-search-private.h
+++ b/src/plugins/terminal/gb-terminal-search-private.h
@@ -18,7 +18,6 @@
#pragma once
-#include <libgd/gd.h>
#include <ide.h>
#include <vte/vte.h>
@@ -32,7 +31,7 @@ struct _GbTerminalSearch
GtkRevealer *search_revealer;
- GdTaggedEntry *search_entry;
+ IdeTaggedEntry *search_entry;
GtkButton *search_prev_button;
GtkButton *search_next_button;
diff --git a/src/plugins/terminal/gb-terminal-search.c b/src/plugins/terminal/gb-terminal-search.c
index 4f45e61..34e5eb3 100644
--- a/src/plugins/terminal/gb-terminal-search.c
+++ b/src/plugins/terminal/gb-terminal-search.c
@@ -149,7 +149,7 @@ update_regex (GbTerminalSearch *self)
}
static void
-search_text_changed_cb (GdTaggedEntry *search_entry,
+search_text_changed_cb (IdeTaggedEntry *search_entry,
GbTerminalSearch *self)
{
update_regex (self);
@@ -312,8 +312,6 @@ gb_terminal_search_class_init (GbTerminalSearchClass *klass)
gtk_widget_class_bind_template_child (widget_class, GbTerminalSearch, search_revealer);
gtk_widget_class_bind_template_child (widget_class, GbTerminalSearch, search_options);
- g_type_ensure (GD_TYPE_TAGGED_ENTRY);
-
signals[SEARCH] =
g_signal_new ("search",
G_OBJECT_CLASS_TYPE (object_class),
diff --git a/src/plugins/terminal/gb-terminal-search.ui b/src/plugins/terminal/gb-terminal-search.ui
index c7bab92..790bd9f 100644
--- a/src/plugins/terminal/gb-terminal-search.ui
+++ b/src/plugins/terminal/gb-terminal-search.ui
@@ -25,7 +25,7 @@
<property name="row_spacing">8</property>
<property name="column_spacing">8</property>
<child>
- <object class="GdTaggedEntry" id="search_entry">
+ <object class="IdeTaggedEntry" id="search_entry">
<property name="visible">true</property>
<property name="can_focus">true</property>
<property name="width-chars">20</property>
diff --git a/src/plugins/terminal/gb-terminal-view-private.h b/src/plugins/terminal/gb-terminal-view-private.h
index c119d10..10992b3 100644
--- a/src/plugins/terminal/gb-terminal-view-private.h
+++ b/src/plugins/terminal/gb-terminal-view-private.h
@@ -18,7 +18,6 @@
#pragma once
-#include <libgd/gd.h>
#include <ide.h>
#include <vte/vte.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
