mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
Qt/D3D: Fix render widget size not being restored properly
This commit is contained in:
parent
9bdf7c4b5a
commit
eef2092854
@ -667,6 +667,10 @@ void MainWindow::FullScreen()
|
|||||||
// settings. If it's set to be fullscreen then it just remakes the window,
|
// settings. If it's set to be fullscreen then it just remakes the window,
|
||||||
// which probably isn't ideal.
|
// which probably isn't ideal.
|
||||||
bool was_fullscreen = m_render_widget->isFullScreen();
|
bool was_fullscreen = m_render_widget->isFullScreen();
|
||||||
|
|
||||||
|
if (!was_fullscreen)
|
||||||
|
m_render_widget_geometry = m_render_widget->saveGeometry();
|
||||||
|
|
||||||
HideRenderWidget(false);
|
HideRenderWidget(false);
|
||||||
SetFullScreenResolution(!was_fullscreen);
|
SetFullScreenResolution(!was_fullscreen);
|
||||||
|
|
||||||
@ -676,7 +680,6 @@ void MainWindow::FullScreen()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_render_widget_geometry = m_render_widget->saveGeometry();
|
|
||||||
m_render_widget->showFullScreen();
|
m_render_widget->showFullScreen();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -761,6 +764,9 @@ void MainWindow::ShowRenderWidget()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetFullScreenResolution(false);
|
||||||
|
Host::GetInstance()->SetRenderFullscreen(false);
|
||||||
|
|
||||||
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.
|
||||||
@ -781,8 +787,6 @@ void MainWindow::ShowRenderWidget()
|
|||||||
m_render_widget->showNormal();
|
m_render_widget->showNormal();
|
||||||
m_render_widget->restoreGeometry(m_render_widget_geometry);
|
m_render_widget->restoreGeometry(m_render_widget_geometry);
|
||||||
}
|
}
|
||||||
|
|
||||||
SetFullScreenResolution(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::HideRenderWidget(bool reinit)
|
void MainWindow::HideRenderWidget(bool reinit)
|
||||||
|
Loading…
Reference in New Issue
Block a user