<div dir="ltr">nothing, thought I would resubmit since the directory paths changed (qt4 renamed to qt)</div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Feb 28, 2016 at 2:03 PM, Jean-Baptiste Kempf <span dir="ltr"><<a href="mailto:jb@videolan.org" target="_blank">jb@videolan.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">What is the change compared to the previous patch?<br>
<br>
On 28 Feb, Darrell Walisser wrote :<br>
<div><div class="h5">> ---<br>
>  modules/gui/qt/components/interface_widgets.cpp | 10 ++++++++++<br>
>  modules/gui/qt/main_interface.cpp               | 19 +++++++++++++++----<br>
>  2 files changed, 25 insertions(+), 4 deletions(-)<br>
><br>
> diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp<br>
> index 920bf68..b6c37e5 100644<br>
> --- a/modules/gui/qt/components/interface_widgets.cpp<br>
> +++ b/modules/gui/qt/components/interface_widgets.cpp<br>
> @@ -183,6 +183,16 @@ WId VideoWidget::request( struct vout_window_t *p_wnd, unsigned int *pi_width,<br>
>     Parent has to care about resizing itself */<br>
>  void VideoWidget::setSize( unsigned int w, unsigned int h )<br>
>  {<br>
> +    /* If the size changed, resizeEvent will be called, otherwise not,<br>
> +     * in which case we need to tell the vout what the size actually is<br>
> +     */<br>
> +    if( (unsigned)size().width() == w && (unsigned)size().height() == h )<br>
> +    {<br>
> +         if( p_window != NULL )<br>
> +            vout_window_ReportSize( p_window, w, h );<br>
> +        return;<br>
> +    }<br>
> +<br>
>      resize( w, h );<br>
>      emit sizeChanged( w, h );<br>
>      /* Work-around a bug?misconception? that would happen when vout core resize<br>
> diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp<br>
> index 90f941c..08ab7c7 100644<br>
> --- a/modules/gui/qt/main_interface.cpp<br>
> +++ b/modules/gui/qt/main_interface.cpp<br>
> @@ -215,11 +215,13 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )<br>
>      {<br>
>          if( b_autoresize )<br>
>          {<br>
> -            CONNECT( this, askVideoToResize( unsigned int, unsigned int ),<br>
> -                     this, setVideoSize( unsigned int, unsigned int ) );<br>
>              CONNECT( videoWidget, sizeChanged( int, int ),<br>
>                       this, videoSizeChanged( int,  int ) );<br>
>          }<br>
> +<br>
> +        CONNECT( this, askVideoToResize( unsigned int, unsigned int ),<br>
> +                 this, setVideoSize( unsigned int, unsigned int ) );<br>
> +<br>
>          CONNECT( this, askVideoSetFullScreen( bool ),<br>
>                   this, setVideoFullScreen( bool ) );<br>
>      }<br>
> @@ -777,8 +779,17 @@ void MainInterface::releaseVideoSlot( void )<br>
><br>
>  void MainInterface::setVideoSize( unsigned int w, unsigned int h )<br>
>  {<br>
> -    if( !isFullScreen() && !isMaximized() )<br>
> -        videoWidget->setSize( w, h );<br>
> +    if (!isFullScreen() && !isMaximized() )<br>
> +    {<br>
> +        /* Resize video widget to video size, or keep it at the same<br>
> +         * size. Call setSize() either way so that vout_window_ReportSize<br>
> +         * will always get called.<br>
> +         */<br>
> +        if (b_autoresize)<br>
> +            videoWidget->setSize( w, h );<br>
> +        else<br>
> +            videoWidget->setSize( videoWidget->width(), videoWidget->height() );<br>
> +    }<br>
>  }<br>
><br>
>  void MainInterface::videoSizeChanged( int w, int h )<br>
> --<br>
> 2.5.0<br>
><br>
</div></div>> _______________________________________________<br>
> vlc-devel mailing list<br>
> To unsubscribe or modify your subscription options:<br>
> <a href="https://mailman.videolan.org/listinfo/vlc-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a><br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
With my kindest regards,<br>
<br>
--<br>
Jean-Baptiste Kempf<br>
<a href="http://www.jbkempf.com/" rel="noreferrer" target="_blank">http://www.jbkempf.com/</a> - <a href="tel:%2B33%20672%20704%20734" value="+33672704734">+33 672 704 734</a><br>
Sent from my Electronic Device<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a><br>
</font></span></blockquote></div><br></div>