Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-27 08:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix controller navigation for fullscreen UI

Browse source
This commit is contained in:
Connor McLaughlin 2021-02-27 01:17:44 +10:00
parent d6b8a80eb7
commit b4e4e5891d
5 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/duckstation-nogui/nogui_host_interface.cpp
View file

@ -194,22 +194,12 @@ void NoGUIHostInterface::RequestExit()
m_quit_request = true; m_quit_request = true;
} }
void NoGUIHostInterface::PollAndUpdate()
{
CommonHostInterface::PollAndUpdate();
if (m_controller_interface)
m_controller_interface->PollEvents();
}
void NoGUIHostInterface::Run() void NoGUIHostInterface::Run()
{ {
while (!m_quit_request) while (!m_quit_request)
{ {
RunCallbacks(); RunCallbacks();
PollAndUpdate(); PollAndUpdate();
if (m_fullscreen_ui_enabled)
FullscreenUI::SetImGuiNavInputs();
ImGui::NewFrame(); ImGui::NewFrame();

1
src/duckstation-nogui/nogui_host_interface.h
View file

@ -42,7 +42,6 @@ protected:
void ReleaseHostDisplay() override; void ReleaseHostDisplay() override;
void RequestExit() override; void RequestExit() override;
virtual void PollAndUpdate() override;
virtual bool CreatePlatformWindow(bool fullscreen) = 0; virtual bool CreatePlatformWindow(bool fullscreen) = 0;
virtual void DestroyPlatformWindow() = 0; virtual void DestroyPlatformWindow() = 0;

8
src/duckstation-qt/qthostinterface.cpp
View file

@ -651,14 +651,6 @@ void* QtHostInterface::GetTopLevelWindowHandle() const
return reinterpret_cast<void*>(m_main_window->winId()); return reinterpret_cast<void*>(m_main_window->winId());
} }
void QtHostInterface::PollAndUpdate()
{
CommonHostInterface::PollAndUpdate();
if (m_controller_interface)
m_controller_interface->PollEvents();
}
void QtHostInterface::RequestExit() void QtHostInterface::RequestExit()
{ {
emit exitRequested(); emit exitRequested();

1
src/duckstation-qt/qthostinterface.h
View file

@ -192,7 +192,6 @@ protected:
void ReleaseHostDisplay() override; void ReleaseHostDisplay() override;
bool IsFullscreen() const override; bool IsFullscreen() const override;
bool SetFullscreen(bool enabled) override; bool SetFullscreen(bool enabled) override;
void PollAndUpdate() override;
void RequestExit() override; void RequestExit() override;
std::optional<HostKeyCode> GetHostKeyCode(const std::string_view key_code) const override; std::optional<HostKeyCode> GetHostKeyCode(const std::string_view key_code) const override;

6
src/frontend-common/common_host_interface.cpp
View file

@ -470,6 +470,12 @@ void CommonHostInterface::OnAchievementsRefreshed()
void CommonHostInterface::PollAndUpdate() void CommonHostInterface::PollAndUpdate()
{ {
if (m_controller_interface)
m_controller_interface->PollEvents();
if (m_fullscreen_ui_enabled)
FullscreenUI::SetImGuiNavInputs();
#ifdef WITH_DISCORD_PRESENCE #ifdef WITH_DISCORD_PRESENCE
PollDiscordPresence(); PollDiscordPresence();
#endif #endif