From: Christian Hergert <chergert@redhat.com>
Date: Thu, 5 Aug 2021 18:52:45 +0000 (-0700)
Subject: Revert "textview: fix yoffset position when top_margin is set"
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~1^2~32^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc701baef88de89902e08a96bbf6e807acd5049b;p=gtk4.git

Revert "textview: fix yoffset position when top_margin is set"

This reverts commit 908b1e5e1214afc01440bc07a8d937222f411f38.

This commit broke top-margin altogether.
---

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)
         {