diff options
| author | Christian Hergert <chergert@redhat.com> | 2019-10-03 19:21:45 -0700 |
|---|---|---|
| committer | Christian Hergert <chergert@redhat.com> | 2019-10-04 14:45:43 -0700 |
| commit | fea2a82ef6d66d6de8fb13657614534bd6e1f5fc (patch) | |
| tree | 28e5098c5c638d6cd0319931fb1200d586fcaf3a /gtk/gtktextview.h | |
| parent | 8373cc6c471f478dbf48fad7f5532e27f286c150 (diff) | |
| download | gtk+-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/gtktextview.h')
| -rw-r--r-- | gtk/gtktextview.h | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index 489b5ebf1f..d386aebf70 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -44,7 +44,6 @@ G_BEGIN_DECLS /** * GtkTextWindowType: - * @GTK_TEXT_WINDOW_PRIVATE: Private value, used internally * @GTK_TEXT_WINDOW_WIDGET: Window that floats over scrolling areas. * @GTK_TEXT_WINDOW_TEXT: Scrollable text window. * @GTK_TEXT_WINDOW_LEFT: Left side border window. @@ -56,8 +55,7 @@ G_BEGIN_DECLS */ typedef enum { - GTK_TEXT_WINDOW_PRIVATE, - GTK_TEXT_WINDOW_WIDGET, + GTK_TEXT_WINDOW_WIDGET = 1, GTK_TEXT_WINDOW_TEXT, GTK_TEXT_WINDOW_LEFT, GTK_TEXT_WINDOW_RIGHT, @@ -281,14 +279,6 @@ void gtk_text_view_window_to_buffer_coords (GtkTextView *text_view, gint *buffer_y); GDK_AVAILABLE_IN_ALL -void gtk_text_view_set_border_window_size (GtkTextView *text_view, - GtkTextWindowType type, - gint size); -GDK_AVAILABLE_IN_ALL -gint gtk_text_view_get_border_window_size (GtkTextView *text_view, - GtkTextWindowType type); - -GDK_AVAILABLE_IN_ALL gboolean gtk_text_view_forward_display_line (GtkTextView *text_view, GtkTextIter *iter); GDK_AVAILABLE_IN_ALL @@ -316,24 +306,28 @@ void gtk_text_view_reset_im_context (GtkTextView /* Adding child widgets */ GDK_AVAILABLE_IN_ALL -void gtk_text_view_add_child_at_anchor (GtkTextView *text_view, - GtkWidget *child, - GtkTextChildAnchor *anchor); +GtkWidget *gtk_text_view_get_gutter (GtkTextView *text_view, + GtkTextWindowType win); +GDK_AVAILABLE_IN_ALL +void gtk_text_view_set_gutter (GtkTextView *text_view, + GtkTextWindowType win, + GtkWidget *widget); +GDK_AVAILABLE_IN_ALL +void gtk_text_view_add_child_at_anchor (GtkTextView *text_view, + GtkWidget *child, + GtkTextChildAnchor *anchor); GDK_AVAILABLE_IN_ALL -void gtk_text_view_add_child_in_window (GtkTextView *text_view, - GtkWidget *child, - GtkTextWindowType which_window, - /* window coordinates */ - gint xpos, - gint ypos); +void gtk_text_view_add_overlay (GtkTextView *text_view, + GtkWidget *child, + gint xpos, + gint ypos); GDK_AVAILABLE_IN_ALL -void gtk_text_view_move_child (GtkTextView *text_view, - GtkWidget *child, - /* window coordinates */ - gint xpos, - gint ypos); +void gtk_text_view_move_overlay (GtkTextView *text_view, + GtkWidget *child, + gint xpos, + gint ypos); /* Default style settings (fallbacks if no tag affects the property) */ |