summaryrefslogtreecommitdiff
path: root/gtk/gtktextutil.c
diff options
context:
space:
mode:
authorChristian Hergert <chergert@redhat.com>2019-10-03 19:21:45 -0700
committerChristian Hergert <chergert@redhat.com>2019-10-04 14:45:43 -0700
commitfea2a82ef6d66d6de8fb13657614534bd6e1f5fc (patch)
tree28e5098c5c638d6cd0319931fb1200d586fcaf3a /gtk/gtktextutil.c
parent8373cc6c471f478dbf48fad7f5532e27f286c150 (diff)
downloadgtk+-fea2a82ef6d66d6de8fb13657614534bd6e1f5fc.tar.gz
textview: use GtkTextViewChild for border and overlay children
This creates a new GtkTextViewChild that can manage overlay children at given x,y offsets in buffer coordinates. This simplifies GtkTextView by extracting this from GtkTextWindow as well as providing a real widget for the borders. With this change, we also rename gtk_text_view_add_child_in_window() to gtk_text_view_add_overlay(). For those that were using GTK_TEXT_WINDOW_WIDGET, they can use a GtkOverlay. It does not appear that anyone was using GTK_TEXT_WINDOW_(LEFT|RIGHT|TOP|BOTTOM) for widgets in this fashion, but that can be done by setting a gutter widget with gtk_text_view_set_gutter(). We can make GtkTextViewChild public if necessary to simplify this should it become necessary. GtkTextViewChild will setup a CSS node of either "text" or "border" depending on the GtkTextWindowType. The old GtkTextViewChild has been renamed to AnchoredChild as it is only used for widgets with anchors in the GtkTextBuffer. This also removes the use of allocated GSList and instead embeds a GQueue and GList to save a few extraneous allocations.
Diffstat (limited to 'gtk/gtktextutil.c')
-rw-r--r--gtk/gtktextutil.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index 200f87285c..fa10328d46 100644
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -158,6 +158,19 @@ set_attributes_from_style (GtkStyleContext *context,
gtk_style_context_get (context, "font", &values->font, NULL);
}
+static gint
+get_border_window_size (GtkTextView *text_view,
+ GtkTextWindowType window_type)
+{
+ GtkWidget *gutter;
+
+ gutter = gtk_text_view_get_gutter (text_view, window_type);
+ if (gutter != NULL)
+ return gtk_widget_get_width (gutter);
+
+ return 0;
+}
+
GdkPaintable *
gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
GtkTextBuffer *buffer,
@@ -208,8 +221,8 @@ gtk_text_util_create_rich_drag_icon (GtkWidget *widget,
if (GTK_IS_TEXT_VIEW (widget))
{
layout_width = layout_width
- - gtk_text_view_get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT)
- - gtk_text_view_get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_RIGHT);
+ - get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_LEFT)
+ - get_border_window_size (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_RIGHT);
}
style->direction = gtk_widget_get_direction (widget);