Qt: Fix "Render To Main" not booting into fullscreen

This commit is contained in:
spycrab
2018-04-27 15:04:26 +02:00
parent d3db8fc381
commit eefa6db57c

View File

@ -670,10 +670,17 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
void MainWindow::ShowRenderWidget() void MainWindow::ShowRenderWidget()
{ {
if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen())
{
m_render_widget->showFullScreen();
return;
}
if (SConfig::GetInstance().bRenderToMain) if (SConfig::GetInstance().bRenderToMain)
{ {
// If we're rendering to main, add it to the stack and update our title when necessary. // If we're rendering to main, add it to the stack and update our title when necessary.
m_rendering_to_main = true; m_rendering_to_main = true;
m_stack->setCurrentIndex(m_stack->addWidget(m_render_widget)); m_stack->setCurrentIndex(m_stack->addWidget(m_render_widget));
connect(Host::GetInstance(), &Host::RequestTitle, this, &MainWindow::setWindowTitle); connect(Host::GetInstance(), &Host::RequestTitle, this, &MainWindow::setWindowTitle);
m_stack->repaint(); m_stack->repaint();
@ -682,15 +689,9 @@ void MainWindow::ShowRenderWidget()
{ {
// Otherwise, just show it. // Otherwise, just show it.
m_rendering_to_main = false; m_rendering_to_main = false;
if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen())
{ m_render_widget->showNormal();
m_render_widget->showFullScreen(); m_render_widget->resize(640, 480);
}
else
{
m_render_widget->showNormal();
m_render_widget->resize(640, 480);
}
} }
} }