Ver código fonte

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

ocornut 10 meses atrás
pai
commit
d7cedd648b
3 arquivos alterados com 4 adições e 2 exclusões
  1. 1 1
      backends/imgui_impl_sdl2.cpp
  2. 1 1
      backends/imgui_impl_sdl3.cpp
  3. 2 0
      docs/CHANGELOG.txt

+ 1 - 1
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

+ 1 - 1
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)

+ 2 - 0
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)