From: Benjamin Otte <otte@redhat.com>
Date: Sat, 9 Jun 2018 20:54:04 +0000 (+0200)
Subject: video: Use a Picture instead of an Image
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~198
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45d78f360f22d811564cc63654a2559409b33974;p=gtk4.git

video: Use a Picture instead of an Image
---

diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c
index f9e2eb9eb3..aa7a8869fd 100644
--- a/gtk/gtkvideo.c
+++ b/gtk/gtkvideo.c
@@ -26,6 +26,7 @@
 #include "gtkintl.h"
 #include "gtkmediacontrols.h"
 #include "gtkmediafile.h"
+#include "gtkpicture.h"
 #include "gtkrevealer.h"
 
 /**
@@ -48,7 +49,7 @@ struct _GtkVideo
   GtkMediaStream *media_stream;
 
   GtkWidget *box;
-  GtkWidget *video_image;
+  GtkWidget *video_picture;
   GtkWidget *overlay_icon;
   GtkWidget *controls_revealer;
   GtkWidget *controls;
@@ -326,7 +327,7 @@ gtk_video_class_init (GtkVideoClass *klass)
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkvideo.ui");
   gtk_widget_class_bind_template_child (widget_class, GtkVideo, box);
-  gtk_widget_class_bind_template_child (widget_class, GtkVideo, video_image);
+  gtk_widget_class_bind_template_child (widget_class, GtkVideo, video_picture);
   gtk_widget_class_bind_template_child (widget_class, GtkVideo, overlay_icon);
   gtk_widget_class_bind_template_child (widget_class, GtkVideo, controls);
   gtk_widget_class_bind_template_child (widget_class, GtkVideo, controls_revealer);
@@ -595,7 +596,7 @@ gtk_video_set_media_stream (GtkVideo       *self,
     }
 
   gtk_media_controls_set_media_stream (GTK_MEDIA_CONTROLS (self->controls), stream);
-  gtk_image_set_from_paintable (GTK_IMAGE (self->video_image), GDK_PAINTABLE (stream));
+  gtk_picture_set_paintable (GTK_PICTURE (self->video_picture), GDK_PAINTABLE (stream));
 
   gtk_video_update_all (self);
 
diff --git a/gtk/ui/gtkvideo.ui b/gtk/ui/gtkvideo.ui
index 537fb6973f..4b16433f70 100644
--- a/gtk/ui/gtkvideo.ui
+++ b/gtk/ui/gtkvideo.ui
@@ -5,9 +5,7 @@
     <child>
       <object class="GtkOverlay" id="box">
         <child>
-          <object class="GtkImage" id="video_image">
-            <property name="can-shrink">1</property>
-          </object>
+          <object class="GtkPicture" id="video_picture" />
         </child>
         <child type="overlay">
           <object class="GtkImage" id="overlay_icon">