[gtk+/wip/gl-texture] fix error screen



commit 0b982dd1c59d32550fc9c56ddad27a2880fd5b15
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jan 17 07:37:37 2018 -0500

    fix error screen

 gtk/gtkglarea.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
index 9074a23..a1397ff 100644
--- a/gtk/gtkglarea.c
+++ b/gtk/gtkglarea.c
@@ -606,10 +606,10 @@ gtk_gl_area_size_allocate (GtkWidget           *widget,
 }
 
 static void
-gtk_gl_area_draw_error_screen (GtkGLArea *area,
-                               cairo_t   *cr,
-                               gint       width,
-                               gint       height)
+gtk_gl_area_draw_error_screen (GtkGLArea   *area,
+                               GtkSnapshot *snapshot,
+                               gint         width,
+                               gint         height)
 {
   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
   PangoLayout *layout;
@@ -620,10 +620,11 @@ gtk_gl_area_draw_error_screen (GtkGLArea *area,
   pango_layout_set_width (layout, width * PANGO_SCALE);
   pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
   pango_layout_get_pixel_size (layout, NULL, &layout_height);
-  gtk_render_layout (gtk_widget_get_style_context (GTK_WIDGET (area)),
-                     cr,
-                     0, (height - layout_height) / 2,
-                     layout);
+
+  gtk_snapshot_render_layout (snapshot,
+                              gtk_widget_get_style_context (GTK_WIDGET (area)),
+                              0, (height - layout_height) / 2,
+                              layout);
 
   g_object_unref (layout);
 }
@@ -638,16 +639,14 @@ gtk_gl_area_snapshot (GtkWidget   *widget,
   int w, h, scale;
   GLenum status;
 
-#if 0
   if (priv->error != NULL)
     {
       gtk_gl_area_draw_error_screen (area,
-                                     cr,
+                                     snapshot,
                                      gtk_widget_get_width (widget),
                                      gtk_widget_get_height (widget));
-      return FALSE;
+      return;
     }
-#endif
 
   if (priv->context == NULL)
     return;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]