From 7f04a562b2e1ece4c85165b4efdf4258cdf94d74 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya-ai@users.noreply.github.com> Date: Tue, 17 Jan 2023 21:52:43 -0500 Subject: [PATCH] fix: update imgui helpers (#98) update supportsViewports to correctly return false for swithc add supportsWindowedFullscreen method Co-authored-by: briaguya --- src/menu/ImGuiImpl.cpp | 18 ++++++++++++++++++ src/menu/ImGuiImpl.h | 1 + 2 files changed, 19 insertions(+) diff --git a/src/menu/ImGuiImpl.cpp b/src/menu/ImGuiImpl.cpp index 1fad62f97..8e729cd12 100644 --- a/src/menu/ImGuiImpl.cpp +++ b/src/menu/ImGuiImpl.cpp @@ -312,7 +312,25 @@ void ImGuiRenderDrawData(ImDrawData* data) { } } +bool supportsWindowedFullscreen() { +#ifdef __SWITCH__ + return false; +#endif + + // We don't yet support windowed fullscreen on DirectX + switch (impl.backend) { + case Backend::SDL: + return true; + default: + return false; + } +} + bool supportsViewports() { +#ifdef __SWITCH__ + return false; +#endif + switch (impl.backend) { case Backend::DX11: return true; diff --git a/src/menu/ImGuiImpl.h b/src/menu/ImGuiImpl.h index 81444da96..6bf95fdf8 100644 --- a/src/menu/ImGuiImpl.h +++ b/src/menu/ImGuiImpl.h @@ -66,6 +66,7 @@ typedef struct { WindowDrawFunc drawFunc; } CustomWindow; +bool supportsWindowedFullscreen(); bool supportsViewports(); void Init(WindowImpl window_impl);