vlc/vlc-2.2 | branch: master | Hannes Domani <[email protected]> | Fri Feb 26 
20:21:47 2016 +0100| [e28a7da31fc4a568670b2831a6947099821548e1] | committer: 
Jean-Baptiste Kempf

Qt: increase height for resume-panel

Needed because hideResumePanel() decreases the height.
Close #14566

Signed-off-by: Jean-Baptiste Kempf <[email protected]>
(cherry picked from commit b1b21338cd195aab1de59d2608a4f90ae7cb5893)
Signed-off-by: Jean-Baptiste Kempf <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e28a7da31fc4a568670b2831a6947099821548e1
---

 modules/gui/qt4/main_interface.cpp |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/qt4/main_interface.cpp 
b/modules/gui/qt4/main_interface.cpp
index d02f353..5b726cf 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -417,6 +417,8 @@ void MainInterface::showResumePanel( int64_t _time ) {
         resumePlayback();
     else
     {
+        if( !isFullScreen() && !isMaximized() )
+            resize( width(), height() + resumePanel->height() );
         resumePanel->setVisible(true);
         resumeTimer->start();
     }

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to