summaryrefslogtreecommitdiff
path: root/ext/gtk
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2015-06-15 21:24:01 +0200
committerSebastian Dröge <sebastian@centricular.com>2015-06-15 21:24:01 +0200
commit8b821e0cf350f79927864749d4ce87e3abef888e (patch)
tree1dc16297746c8b7f00560e8ef09cfc14e3fa81c5 /ext/gtk
parentdf034766c55e5e9ceb3da9bb21bf809f99da0675 (diff)
downloadgstreamer-plugins-bad-8b821e0cf350f79927864749d4ce87e3abef888e.tar.gz
gtk: Use the display width/height for the widget's preferred width/height
Diffstat (limited to 'ext/gtk')
-rw-r--r--ext/gtk/gtkgstglwidget.c4
-rw-r--r--ext/gtk/gtkgstwidget.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/gtk/gtkgstglwidget.c b/ext/gtk/gtkgstglwidget.c
index adca9cdf6..d9b65e3c1 100644
--- 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 023d3766a..36a787423 100644
--- 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;