Commit 126c2dec authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: correct the size behaviour when zoom is called

parent de1d714f
...@@ -587,8 +587,9 @@ void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y, ...@@ -587,8 +587,9 @@ void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
*p_id = ret; *p_id = ret;
if( ret ) /* The videoWidget is available */ if( ret ) /* The videoWidget is available */
{ {
/* ask videoWidget to show */ /* Ask videoWidget to resize correctly, if we are in normal mode */
videoWidget->SetSizing( *pi_width, *pi_height ); if( !isFullScreen() && !isMaximized() )
videoWidget->SetSizing( *pi_width, *pi_height );
/* Consider the video active now */ /* Consider the video active now */
showVideo(); showVideo();
...@@ -621,6 +622,8 @@ int MainInterface::controlVideo( int i_query, va_list args ) ...@@ -621,6 +622,8 @@ int MainInterface::controlVideo( int i_query, va_list args )
{ {
unsigned int i_width = va_arg( args, unsigned int ); unsigned int i_width = va_arg( args, unsigned int );
unsigned int i_height = va_arg( args, unsigned int ); unsigned int i_height = va_arg( args, unsigned int );
if( isFullScreen() || isMaximized() )
showNormal();
emit askVideoToResize( i_width, i_height ); emit askVideoToResize( i_width, i_height );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
Markdown is supported
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