Fix OSD display when vout crop is used (so that every thing stays on the displayed...

[vlc] / src / osd / osd_widgets.c

diff --git a/src/osd/osd_widgets.c b/src/osd/osd_widgets.c
index 2a508c1bcc84b4c9f7aaceeb70a86d140ae67e32..c89ad56c7b56f1922aa6598cd73b67afbd242aec 100644 (file)
--- a/src/osd/osd_widgets.c
+++ b/src/osd/osd_widgets.c
@@ -213,6 +213,7 @@ subpicture_t *osd_CreateWidget( spu_t *p_spu, int i_channel )
  *****************************************************************************/
 int osd_Slider( vlc_object_t *p_this, spu_t *p_spu,
     int i_render_width, int i_render_height,
+    int i_margin_left, int i_margin_bottom,
     int i_channel, int i_position, short i_type )
 {
     subpicture_t *p_subpic;
@@ -225,7 +226,9 @@ int osd_Slider( vlc_object_t *p_this, spu_t *p_spu,
     }
 
     i_y_margin = i_render_height / 10;
-    i_x_margin = i_y_margin;
+    i_x_margin = i_y_margin + i_margin_left;
+    i_y_margin += i_margin_bottom;
+
     if( i_type == OSD_HOR_SLIDER )
     {
         i_width = i_render_width - 2 * i_x_margin;
@@ -272,7 +275,8 @@ int osd_Slider( vlc_object_t *p_this, spu_t *p_spu,
  * Types are: OSD_PLAY_ICON, OSD_PAUSE_ICON, OSD_SPEAKER_ICON, OSD_MUTE_ICON
  *****************************************************************************/
 int osd_Icon( vlc_object_t *p_this, spu_t *p_spu,
-    int i_render_width, int i_render_height, int i_channel, short i_type )
+    int i_render_width, int i_render_height, int i_margin_right,
+    int i_margin_top, int i_channel, short i_type )
 {
     subpicture_t *p_subpic;
     int i_x_margin, i_y_margin, i_x, i_y, i_width, i_height;
@@ -284,7 +288,8 @@ int osd_Icon( vlc_object_t *p_this, spu_t *p_spu,
     }
 
     i_y_margin = i_render_height / 15;
-    i_x_margin = i_y_margin;
+    i_x_margin = i_y_margin + i_margin_right;
+    i_y_margin += i_margin_top;
     i_width = i_render_width / 20;
     i_height = i_width;
     i_x = i_render_width - i_x_margin - i_width;