ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix confirm dialog parenting to wrong window

This commit is contained in:
Stenzek 2023-11-20 23:28:00 +10:00 committed by Connor McLaughlin
parent 0770249da1
commit 67c5509524
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcsx2-qt/MainWindow.cpp
View File

@ -958,7 +958,8 @@ bool MainWindow::shouldHideMainWindow() const
{
// NOTE: We can't use isRenderingToMain() here, because this happens post-fullscreen-switch.
return Host::GetBoolSettingValue("UI", "HideMainWindowWhenRunning", false) ||
(g_emu_thread->shouldRenderToMain() && isRenderingFullscreen()) || QtHost::InNoGUIMode();
(g_emu_thread->shouldRenderToMain() && (isRenderingFullscreen() || m_is_temporarily_windowed)) ||
QtHost::InNoGUIMode();
}
void MainWindow::switchToGameListView()
@ -2097,7 +2098,7 @@ void MainWindow::createDisplayWidget(bool fullscreen, bool render_to_main)
// and positioning has no effect anyway.
if (!s_use_central_widget)
{
if (isVisible() && g_emu_thread->shouldRenderToMain())
if ((isVisible() || m_is_temporarily_windowed) && g_emu_thread->shouldRenderToMain())
container->move(pos());
else
restoreDisplayWindowGeometryFromConfig();
@ -2759,9 +2760,19 @@ MainWindow::VMLock MainWindow::pauseAndLockVM()
// However, we do not want to switch back to render-to-main, the window might have generated this event.
if (was_fullscreen)
{
// m_is_temporarily_windowed needs to be set, so that we don't show the main window just for this popup.
pxAssertRel(!g_main_window->m_is_temporarily_windowed, "Not already temporarily windowed");
g_main_window->m_is_temporarily_windowed = true;
g_emu_thread->setFullscreen(false, false);
while (QtHost::IsVMValid() && g_emu_thread->isFullscreen())
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 1);
// Container could change... thanks Wayland.
QWidget* container;
while (QtHost::IsVMValid() && (g_emu_thread->isFullscreen() ||
!(container = getDisplayContainer()) || container->isFullScreen()))
{
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
}
}
// Now we'll either have a borderless window, or a regular window (if we were exclusive fullscreen).
@ -2795,7 +2806,10 @@ MainWindow::VMLock::VMLock(VMLock&& lock)
MainWindow::VMLock::~VMLock()
{
if (m_was_fullscreen)
{
g_main_window->m_is_temporarily_windowed = false;
g_emu_thread->setFullscreen(true, true);
}
if (!m_was_paused)
g_emu_thread->setVMPaused(false);
@ -2805,6 +2819,7 @@ void MainWindow::VMLock::cancelResume()
{
m_was_paused = true;
m_was_fullscreen = false;
g_main_window->m_is_temporarily_windowed = false;
}
bool QtHost::IsVMValid()

1
pcsx2-qt/MainWindow.h
View File

@ -311,6 +311,7 @@ private:
bool m_was_paused_on_surface_loss = false;
bool m_was_disc_change_request = false;
bool m_is_closing = false;
bool m_is_temporarily_windowed = false;
QString m_last_fps_status;