piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6481 from spycrab/qt_fix_fs

Browse Source 
Qt: Fix fullscreen
This commit is contained in:
Anthony
2018-03-21 16:44:54 -07:00
committed by GitHub
parent 1b0f6a7d2e 8ead5be9f2
commit 30ccaa3fd5
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -566,7 +566,7 @@ void MainWindow::FullScreen()
// settings. If it's set to be fullscreen then it just remakes the window,
// which probably isn't ideal.
bool was_fullscreen = m_render_widget->isFullScreen();
HideRenderWidget();
HideRenderWidget(false);
if (was_fullscreen)
ShowRenderWidget();
else
@ -630,7 +630,7 @@ void MainWindow::ShowRenderWidget()
{
// Otherwise, just show it.
m_rendering_to_main = false;
if (SConfig::GetInstance().bFullscreen)
if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen())
{
m_render_widget->showFullScreen();
}
@ -642,7 +642,7 @@ void MainWindow::ShowRenderWidget()
}
}
void MainWindow::HideRenderWidget()
void MainWindow::HideRenderWidget(bool reinit)
{
if (m_rendering_to_main)
{
@ -655,19 +655,23 @@ void MainWindow::HideRenderWidget()
setWindowTitle(QString::fromStdString(Common::scm_rev_str));
}
m_render_widget->hide();
// The following code works around a driver bug that would lead to Dolphin crashing when changing
// graphics backends (e.g. OpenGL to Vulkan). To avoid this the render widget is (safely)
// recreated
disconnect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
if (reinit)
{
disconnect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
m_render_widget->hide();
m_render_widget->removeEventFilter(this);
m_render_widget->deleteLater();
m_render_widget->removeEventFilter(this);
m_render_widget->deleteLater();
m_render_widget = new RenderWidget;
m_render_widget = new RenderWidget;
m_render_widget->installEventFilter(this);
connect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
m_render_widget->installEventFilter(this);
connect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
}
}
void MainWindow::ShowControllersWindow()