Commit ff219e59 authored by gbazin's avatar gbazin
Browse files

* modules/video_output/x11/xcommon.c,

  modules/gui/wxwindows/video.cpp: fixed size for VOUT_SET_ZOOM.
parent 7e97a491
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video.cpp : wxWindows plugin for vlc * video.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004, 2003 VideoLAN * Copyright (C) 2000-2004, 2003 VideoLAN
* $Id: interface.cpp 6961 2004-03-05 17:34:23Z sam $ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -280,8 +280,8 @@ int VideoWindow::ControlWindow( void *p_window, int i_query, va_list args ) ...@@ -280,8 +280,8 @@ int VideoWindow::ControlWindow( void *p_window, int i_query, va_list args )
double f_arg = va_arg( args, double ); double f_arg = va_arg( args, double );
/* Update dimensions */ /* Update dimensions */
wxSizeEvent event( wxSize(p_vout->render.i_width * f_arg, wxSizeEvent event( wxSize(p_vout->i_window_width * f_arg,
p_vout->render.i_height * f_arg), p_vout->i_window_height * f_arg),
UpdateSize_Event ); UpdateSize_Event );
AddPendingEvent( event ); AddPendingEvent( event );
......
...@@ -2145,10 +2145,11 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) ...@@ -2145,10 +2145,11 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
vlc_mutex_lock( &p_vout->p_sys->lock ); vlc_mutex_lock( &p_vout->p_sys->lock );
/* Update dimensions */ /* Update dimensions */
/* FIXME: export InitWindowSize() from vout core */
XResizeWindow( p_vout->p_sys->p_display, XResizeWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window, p_vout->p_sys->p_win->base_window,
p_vout->render.i_width * f_arg, p_vout->i_window_width * f_arg,
p_vout->render.i_height * f_arg ); p_vout->i_window_height * f_arg );
vlc_mutex_unlock( &p_vout->p_sys->lock ); vlc_mutex_unlock( &p_vout->p_sys->lock );
return VLC_SUCCESS; return VLC_SUCCESS;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment