mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-09 03:40:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6701 from spycrab/qt_fs_rtm

Browse Source 
Qt: Fix "Render To Main" not booting into fullscreen
This commit is contained in:
Anthony 2018-04-27 16:29:08 +01:00 committed by GitHub
commit cbb1f4a3da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinQt2/MainWindow.cpp
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,17 +689,11 @@ 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->showFullScreen();
}
else
{
m_render_widget->showNormal(); m_render_widget->showNormal();
m_render_widget->resize(640, 480); m_render_widget->resize(640, 480);
} }
} }
}
void MainWindow::HideRenderWidget(bool reinit) void MainWindow::HideRenderWidget(bool reinit)
{ {