Permalink
Browse files

Merge pull request #7094 from spycrab/qt_fs_fixes

Qt: Fix multiple fullscreen issues
  • Loading branch information...
spycrab committed Jun 12, 2018
2 parents 8a3679b + 0273cae commit 09df03382d3607fdb865c691d58f209e8f5a589a
@@ -209,6 +209,12 @@ void MainWindow::InitCoreCallbacks()
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [=](Core::State state) {
if (state == Core::State::Uninitialized)
OnStopComplete();
if (state == Core::State::Running && m_fullscreen_requested)
{
FullScreen();
m_fullscreen_requested = false;
}
});
installEventFilter(this);
m_render_widget->installEventFilter(this);
@@ -476,6 +482,10 @@ void MainWindow::ConnectRenderWidget()
m_rendering_to_main = false;
m_render_widget->hide();
connect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
connect(m_render_widget, &RenderWidget::FocusChanged, this, [this](bool focus) {
if (m_render_widget->isFullScreen())
SetFullScreenResolution(focus);
});
}
void MainWindow::ConnectHost()
@@ -771,8 +781,12 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
QMessageBox::critical(this, tr("Error"), tr("Failed to init core"), QMessageBox::Ok);
return;
}
ShowRenderWidget();
if (SConfig::GetInstance().bFullscreen)
m_fullscreen_requested = true;
#ifdef Q_OS_WIN
// Prevents Windows from sleeping, turning off the display, or idling
EXECUTION_STATE shouldScreenSave =
@@ -810,13 +824,6 @@ void MainWindow::SetFullScreenResolution(bool fullscreen)
void MainWindow::ShowRenderWidget()
{
if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen())
{
m_render_widget->showFullScreen();
SetFullScreenResolution(true);
return;
}
SetFullScreenResolution(false);
Host::GetInstance()->SetRenderFullscreen(false);
@@ -871,6 +878,10 @@ void MainWindow::HideRenderWidget(bool reinit)
m_render_widget->installEventFilter(this);
connect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
connect(m_render_widget, &RenderWidget::FocusChanged, this, [this](bool focus) {
if (m_render_widget->isFullScreen())
SetFullScreenResolution(focus);
});
}
}
@@ -175,6 +175,7 @@ class MainWindow final : public QMainWindow
bool m_rendering_to_main;
bool m_stop_requested = false;
bool m_exit_requested = false;
bool m_fullscreen_requested = false;
int m_state_slot = 1;
std::unique_ptr<BootParameters> m_pending_boot;
@@ -52,6 +52,8 @@ RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent)
Qt::DirectConnection);
connect(this, &RenderWidget::SizeChanged, Host::GetInstance(), &Host::ResizeSurface,
Qt::DirectConnection);
connect(this, &RenderWidget::FocusChanged, Host::GetInstance(), &Host::SetRenderFocus,
Qt::DirectConnection);
emit HandleChanged((void*)winId());
@@ -145,14 +147,16 @@ bool RenderWidget::event(QEvent* event)
emit HandleChanged((void*)winId());
break;
case QEvent::WindowActivate:
Host::GetInstance()->SetRenderFocus(true);
if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::State::Paused)
Core::SetState(Core::State::Running);
emit FocusChanged(true);
break;
case QEvent::WindowDeactivate:
Host::GetInstance()->SetRenderFocus(false);
if (SConfig::GetInstance().m_PauseOnFocusLost && Core::GetState() == Core::State::Running)
Core::SetState(Core::State::Paused);
emit FocusChanged(false);
break;
case QEvent::Resize:
{
@@ -28,6 +28,7 @@ class RenderWidget final : public QWidget
void HandleChanged(void* handle);
void StateChanged(bool fullscreen);
void SizeChanged(int new_width, int new_height);
void FocusChanged(bool focus);
private:
void HandleCursorTimer();

0 comments on commit 09df033

Please sign in to comment.