summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2014-06-09 19:30:44 +0100
committerLionel Landwerlin <llandwerlin@gmail.com>2014-06-09 19:30:44 +0100
commit7999e887a9c18aa69dec49f73577c04e1f22321c (patch)
tree794029e4e6122b5028783dbc818d3821216a0c62
parentcf84941cfa039ede429bb7eaded685cfcd47bbfd (diff)
downloadclutter-gst-7999e887a9c18aa69dec49f73577c04e1f22321c.tar.gz
aspectratio: fix aspect ratio with fill_allocation case
-rw-r--r--clutter-gst/clutter-gst-aspectratio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/clutter-gst/clutter-gst-aspectratio.c b/clutter-gst/clutter-gst-aspectratio.c
index a31eb0e..802920f 100644
--- a/clutter-gst/clutter-gst-aspectratio.c
+++ b/clutter-gst/clutter-gst-aspectratio.c
@@ -114,10 +114,10 @@ clutter_gst_aspectratio_get_frame_box (ClutterGstAspectratio *self,
}
}
- paint_box->x1 = (actor_width - new_width) / 2;
- paint_box->y1 = (actor_height - new_height) / 2;
- paint_box->x2 = paint_box->x1 + new_width;
- paint_box->y2 = paint_box->y1 + new_height;
+ paint_box->x1 = MAX ((actor_width - new_width) / 2, 0);
+ paint_box->y1 = MAX ((actor_height - new_height) / 2, 0);
+ paint_box->x2 = MIN (paint_box->x1 + new_width, actor_width);
+ paint_box->y2 = MIN (paint_box->y1 + new_height, actor_height);
if (priv->fill_allocation)
{