[gtk+] textview: Support borders in text node
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] textview: Support borders in text node
- Date: Sat, 27 Feb 2016 02:50:03 +0000 (UTC)
commit 6b4788c3ea3e74bab71e465456b815f3b8a279b4
Author: Benjamin Otte <otte redhat com>
Date: Sat Feb 27 03:39:51 2016 +0100
textview: Support borders in text node
gtk/gtktextview.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index d36570c..e63b661 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4795,11 +4795,16 @@ text_window_set_padding (GtkTextView *text_view,
GtkStyleContext *context)
{
GtkTextViewPrivate *priv;
- GtkBorder padding;
+ GtkBorder padding, border;
priv = text_view->priv;
gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &padding);
+ gtk_style_context_get_padding (context, gtk_style_context_get_state (context), &border);
+ padding.left += border.left;
+ padding.right += border.right;
+ padding.top += border.top;
+ padding.bottom += border.bottom;
if (padding.left != priv->left_padding ||
padding.right != priv->right_padding ||
@@ -5864,6 +5869,10 @@ draw_text (cairo_t *cr,
-priv->xoffset, -priv->yoffset - priv->top_border,
MAX (SCREEN_WIDTH (text_view), priv->width),
MAX (SCREEN_HEIGHT (text_view), priv->height));
+ gtk_render_frame (context, cr,
+ -priv->xoffset, -priv->yoffset - priv->top_border,
+ MAX (SCREEN_WIDTH (text_view), priv->width),
+ MAX (SCREEN_HEIGHT (text_view), priv->height));
gtk_style_context_restore (context);
if (GTK_TEXT_VIEW_GET_CLASS (text_view)->draw_layer != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]