CommonHostInterface: Simplify fullscreen toggle

This commit is contained in:
Connor McLaughlin
2020-04-05 22:58:54 +10:00
parent bf6c1c4866
commit 11e8a91e30
4 changed files with 23 additions and 22 deletions

View File

@ -278,7 +278,7 @@ void QtHostInterface::toggleFullscreen()
return;
}
ToggleFullscreen();
SetFullscreen(!m_is_fullscreen);
}
bool QtHostInterface::AcquireHostDisplay()
@ -317,19 +317,19 @@ void QtHostInterface::ReleaseHostDisplay()
emit destroyDisplayWindowRequested();
}
void QtHostInterface::SetFullscreen(bool enabled)
bool QtHostInterface::IsFullscreen() const
{
return m_is_fullscreen;
}
bool QtHostInterface::SetFullscreen(bool enabled)
{
if (m_is_fullscreen == enabled)
return;
return true;
m_is_fullscreen = enabled;
emit updateDisplayWindowRequested(m_is_fullscreen, m_is_rendering_to_main);
}
void QtHostInterface::ToggleFullscreen()
{
m_is_fullscreen = !m_is_fullscreen;
emit updateDisplayWindowRequested(m_is_fullscreen, m_is_rendering_to_main);
return true;
}
std::optional<CommonHostInterface::HostKeyCode> QtHostInterface::GetHostKeyCode(const std::string_view key_code) const

View File

@ -120,8 +120,8 @@ private Q_SLOTS:
protected:
bool AcquireHostDisplay() override;
void ReleaseHostDisplay() override;
void SetFullscreen(bool enabled) override;
void ToggleFullscreen() override;
bool IsFullscreen() const override;
bool SetFullscreen(bool enabled) override;
std::optional<HostKeyCode> GetHostKeyCode(const std::string_view key_code) const override;