summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-08-06 13:13:21 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-08-06 13:13:21 +0000
commitf328ab9d8392b4cf0c3bbef57c4a940a8d27590e (patch)
treebb48678d0094bd8dbaec42544c905896a43cb035
parentbdbe0acd1ffd5b6e4a02d8f81230756d87a612b0 (diff)
parentfc701baef88de89902e08a96bbf6e807acd5049b (diff)
downloadgtk+-f328ab9d8392b4cf0c3bbef57c4a940a8d27590e.tar.gz
Merge branch 'wip/chergert/revert-top-margin' into 'master'
Revert "textview: fix yoffset position when top_margin is set" See merge request GNOME/gtk!3828
-rw-r--r--gtk/gtktextview.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index d6673bed62..6e1a922e37 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4892,7 +4892,7 @@ changed_handler (GtkTextLayout *layout,
gtk_text_layout_get_line_yrange (layout, &first, &new_first_para_top, NULL);
- old_first_para_top = priv->yoffset - priv->first_para_pixels;
+ old_first_para_top = priv->yoffset - priv->first_para_pixels + priv->top_margin;
if (new_first_para_top != old_first_para_top)
{