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

Qt: Fix exclusive fullscreen not being entered on startup

This commit is contained in:
spycrab 2018-06-08 19:59:24 +02:00
parent 48b7cfa75c
commit 6c19b5947b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,12 @@ void MainWindow::InitCoreCallbacks()
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) { connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) {
if (state == Core::State::Uninitialized) if (state == Core::State::Uninitialized)
OnStopComplete(); OnStopComplete();
if (state == Core::State::Running && m_fullscreen_requested)
{
FullScreen();
m_fullscreen_requested = false;
}
}); });
installEventFilter(this); installEventFilter(this);
m_render_widget->installEventFilter(this); m_render_widget->installEventFilter(this);
@ -771,8 +777,12 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
QMessageBox::critical(this, tr("Error"), tr("Failed to init core"), QMessageBox::Ok); QMessageBox::critical(this, tr("Error"), tr("Failed to init core"), QMessageBox::Ok);
return; return;
} }
ShowRenderWidget(); ShowRenderWidget();
if (SConfig::GetInstance().bFullscreen)
m_fullscreen_requested = true;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// Prevents Windows from sleeping, turning off the display, or idling // Prevents Windows from sleeping, turning off the display, or idling
EXECUTION_STATE shouldScreenSave = EXECUTION_STATE shouldScreenSave =
@ -810,13 +820,6 @@ void MainWindow::SetFullScreenResolution(bool fullscreen)
void MainWindow::ShowRenderWidget() void MainWindow::ShowRenderWidget()
{ {
if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen())
{
m_render_widget->showFullScreen();
SetFullScreenResolution(true);
return;
}
SetFullScreenResolution(false); SetFullScreenResolution(false);
Host::GetInstance()->SetRenderFullscreen(false); Host::GetInstance()->SetRenderFullscreen(false);

1
Source/Core/DolphinQt2/MainWindow.h
View File

@ -175,6 +175,7 @@ private:
bool m_rendering_to_main; bool m_rendering_to_main;
bool m_stop_requested = false; bool m_stop_requested = false;
bool m_exit_requested = false; bool m_exit_requested = false;
bool m_fullscreen_requested = false;
int m_state_slot = 1; int m_state_slot = 1;
std::unique_ptr<BootParameters> m_pending_boot; std::unique_ptr<BootParameters> m_pending_boot;