gtk: Use the display width/height for the widget's preferred width/height

diff --git a/ext/gtk/gtkgstglwidget.c b/ext/gtk/gtkgstglwidget.c
index adca9cdf61baf321f4887435c60aee27ebeef5e8..d9b65e3c11d80303f3a82f0ea0bd9737a89ff29c 100644 (file)
--- a/ext/gtk/gtkgstglwidget.c
+++ b/ext/gtk/gtkgstglwidget.c
@@ -107,7 +107,7 @@ gtk_gst_gl_widget_get_preferred_width (GtkWidget * widget, gint * min,
     gint * natural)
 {
   GtkGstGLWidget *gst_widget = (GtkGstGLWidget *) widget;
-  gint video_width = GST_VIDEO_INFO_WIDTH (&gst_widget->priv->v_info);
+  gint video_width = gst_widget->priv->display_width;
 
   if (!gst_widget->priv->negotiated)
     video_width = 10;
@@ -123,7 +123,7 @@ gtk_gst_gl_widget_get_preferred_height (GtkWidget * widget, gint * min,
     gint * natural)
 {
   GtkGstGLWidget *gst_widget = (GtkGstGLWidget *) widget;
-  gint video_height = GST_VIDEO_INFO_HEIGHT (&gst_widget->priv->v_info);
+  gint video_height = gst_widget->priv->display_height;
 
   if (!gst_widget->priv->negotiated)
     video_height = 10;

diff --git a/ext/gtk/gtkgstwidget.c b/ext/gtk/gtkgstwidget.c
index 023d3766abfb55dcb4288485ff519e942906b0a0..36a787423f6470240d1acef849ff5b339141398c 100644 (file)
--- a/ext/gtk/gtkgstwidget.c
+++ b/ext/gtk/gtkgstwidget.c
@@ -76,7 +76,7 @@ gtk_gst_widget_get_preferred_width (GtkWidget * widget, gint * min,
     gint * natural)
 {
   GtkGstWidget *gst_widget = (GtkGstWidget *) widget;
-  gint video_width = GST_VIDEO_INFO_WIDTH (&gst_widget->priv->v_info);
+  gint video_width = gst_widget->priv->display_width;
 
   if (!gst_widget->priv->negotiated)
     video_width = 10;
@@ -92,7 +92,7 @@ gtk_gst_widget_get_preferred_height (GtkWidget * widget, gint * min,
     gint * natural)
 {
   GtkGstWidget *gst_widget = (GtkGstWidget *) widget;
-  gint video_height = GST_VIDEO_INFO_HEIGHT (&gst_widget->priv->v_info);
+  gint video_height = gst_widget->priv->display_height;
 
   if (!gst_widget->priv->negotiated)
     video_height = 10;