Commit abcfb6cd authored by Ludovic Fauvet's avatar Ludovic Fauvet Committed by Jean-Baptiste Kempf

Qt: hide the resume panel without affecting the vout geometry (refs #12758)

One corner case still remains when leaving the fullscreen since we
cannot resize the UI in this mode.

(cherry picked from commit c7acc87279732139580b8f3f674babee5ef3c1c0)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 50b20beb
...@@ -387,7 +387,7 @@ void MainInterface::createContinueDialog( QWidget *w ) ...@@ -387,7 +387,7 @@ void MainInterface::createContinueDialog( QWidget *w )
continueDialogLayout->addWidget( ok ); continueDialogLayout->addWidget( ok );
continueDialogLayout->addWidget( cancel ); continueDialogLayout->addWidget( cancel );
CONNECT( cancel, clicked(), continueDialog, hide() ); CONNECT( cancel, clicked(), this, hideContinueDialog() );
BUTTONACT(ok, continuePlayback() ); BUTTONACT(ok, continuePlayback() );
CONNECT( THEMIM->getIM(), continuePlayback(int64_t), this, showContinueDialog(int64_t) ); CONNECT( THEMIM->getIM(), continuePlayback(int64_t), this, showContinueDialog(int64_t) );
...@@ -408,14 +408,24 @@ void MainInterface::showContinueDialog( int64_t _time ) { ...@@ -408,14 +408,24 @@ void MainInterface::showContinueDialog( int64_t _time ) {
else else
{ {
continueDialog->setVisible(true); continueDialog->setVisible(true);
QTimer::singleShot(6000, continueDialog, SLOT(hide())); QTimer::singleShot(6000, this, SLOT(hideContinueDialog()));
}
}
void MainInterface::hideContinueDialog()
{
if( continueDialog->isVisible() )
{
if( !isFullScreen() && !isMaximized() )
resize( width(), height() - continueDialog->height() );
continueDialog->hide();
} }
} }
void MainInterface::continuePlayback() void MainInterface::continuePlayback()
{ {
var_SetTime( THEMIM->getInput(), "time", i_continueTime ); var_SetTime( THEMIM->getInput(), "time", i_continueTime );
continueDialog->hide(); hideContinueDialog();
} }
void MainInterface::createMainWidget( QSettings *creationSettings ) void MainInterface::createMainWidget( QSettings *creationSettings )
......
...@@ -260,6 +260,7 @@ private slots: ...@@ -260,6 +260,7 @@ private slots:
void setRaise(); void setRaise();
void showContinueDialog( int64_t); void showContinueDialog( int64_t);
void hideContinueDialog();
void continuePlayback(); void continuePlayback();
signals: signals:
......
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