Backends: SDL2, SDL3: Fixed building for UWP platforms. (#8008)

ocornut · Sep 23, 2024 · d7cedd6 · d7cedd6
1 parent 10fe2b6
commit d7cedd6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/backends/imgui_impl_sdl2.cpp b/backends/imgui_impl_sdl2.cpp
@@ -1037,7 +1037,7 @@ static void ImGui_ImplSDL2_DestroyWindow(ImGuiViewport* viewport)
 static void ImGui_ImplSDL2_ShowWindow(ImGuiViewport* viewport)
 {
     ImGui_ImplSDL2_ViewportData* vd = (ImGui_ImplSDL2_ViewportData*)viewport->PlatformUserData;
-#if defined(_WIN32)
+#if defined(_WIN32) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_GAMES))
     HWND hwnd = (HWND)viewport->PlatformHandleRaw;
 
     // SDL hack: Hide icon from task bar

diff --git a/backends/imgui_impl_sdl3.cpp b/backends/imgui_impl_sdl3.cpp
@@ -989,7 +989,7 @@ static void ImGui_ImplSDL3_DestroyWindow(ImGuiViewport* viewport)
 static void ImGui_ImplSDL3_ShowWindow(ImGuiViewport* viewport)
 {
     ImGui_ImplSDL3_ViewportData* vd = (ImGui_ImplSDL3_ViewportData*)viewport->PlatformUserData;
-#if defined(_WIN32)
+#if defined(_WIN32) && !(defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP || WINAPI_FAMILY == WINAPI_FAMILY_GAMES))
     HWND hwnd = (HWND)viewport->PlatformHandleRaw;
 
     // SDL hack: Show icon in task bar (#7989)

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -50,6 +50,8 @@ Other changes:
 
 Docking+Viewports Branch:
 
+- Backends: SDL2, SDL3: Fixed building for UWP platforms. (#8008)
+
 
 -----------------------------------------------------------------------
  VERSION 1.91.2 (Released 2024-09-19)
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,8 @@ Other changes: @@
     Docking+Viewports Branch:
+    - Backends: SDL2, SDL3: Fixed building for UWP platforms. (#8008)
     -----------------------------------------------------------------------
      VERSION 1.91.2 (Released 2024-09-19)
@@ Expand Down @@