From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 8 Oct 2022 19:17:27 +0000 (-0400)
Subject: render: Use the new layout render api
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~181^2~24
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3145bce6a1ac7cd9f8d1fb9e9b1d0fb57f9f36a0;p=gtk4.git

render: Use the new layout render api
---

diff --git a/gtk/deprecated/gtkrender.c b/gtk/deprecated/gtkrender.c
index 3256c03908..3c9012ec49 100644
--- a/gtk/deprecated/gtkrender.c
+++ b/gtk/deprecated/gtkrender.c
@@ -30,6 +30,7 @@
 #include "gtkrendericonprivate.h"
 #include "gtkrenderborderprivate.h"
 #include "gtkrenderbackgroundprivate.h"
+#include "gtkrenderlayoutprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtksettings.h"
 
@@ -667,33 +668,16 @@ gtk_snapshot_render_layout (GtkSnapshot     *snapshot,
                             double           y,
                             PangoLayout     *layout)
 {
-  const bool needs_translate = (x != 0 || y != 0);
-  const GdkRGBA *fg_color;
-  GtkCssValue *shadows_value;
-  gboolean has_shadow;
+  GtkCssBoxes boxes;
 
   g_return_if_fail (snapshot != NULL);
   g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
   g_return_if_fail (PANGO_IS_LAYOUT (layout));
 
-  if (needs_translate)
-    {
-      gtk_snapshot_save (snapshot);
-      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-    }
-
-  fg_color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR));
-
-  shadows_value = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_TEXT_SHADOW);
-  has_shadow = gtk_css_shadow_value_push_snapshot (shadows_value, snapshot);
-
-  gtk_snapshot_append_layout (snapshot, layout, fg_color);
-
-  if (has_shadow)
-    gtk_snapshot_pop (snapshot);
-
-  if (needs_translate)
-    gtk_snapshot_restore (snapshot);
+  gtk_css_boxes_init_border_box (&boxes,
+                                 gtk_style_context_lookup_style (context),
+                                 x, y, 0, 0);
+  gtk_css_style_snapshot_layout (&boxes, snapshot, x, y, layout);
 }
 
 static void