|
|
@@ -19,6 +19,7 @@
|
|
|
// CHANGELOG
|
|
|
// (minor and older changes stripped away, please see git history for details)
|
|
|
// 2018-XX-XX: Platform: Added support for multiple windows via the ImGuiPlatformIO interface.
|
|
|
+// 2018-12-21: Inputs: Workaround for Android/iOS which don't seem to handle focus related calls.
|
|
|
// 2018-11-30: Misc: Setting up io.BackendPlatformName so it can be displayed in the About Window.
|
|
|
// 2018-11-14: Changed the signature of ImGui_ImplSDL2_ProcessEvent() to take a 'const SDL_Event*'.
|
|
|
// 2018-08-01: Inputs: Workaround for Emscripten which doesn't seem to handle focus related calls.
|
|
|
@@ -45,6 +46,10 @@
|
|
|
// (the multi-viewports feature requires SDL features supported from SDL 2.0.4+. SDL 2.0.5+ is highly recommended)
|
|
|
#include <SDL.h>
|
|
|
#include <SDL_syswm.h>
|
|
|
+#if defined(__APPLE__)
|
|
|
+#include "TargetConditionals.h"
|
|
|
+#endif
|
|
|
+
|
|
|
#define SDL_HAS_CAPTURE_AND_GLOBAL_MOUSE SDL_VERSION_ATLEAST(2,0,4)
|
|
|
#define SDL_HAS_WINDOW_ALPHA SDL_VERSION_ATLEAST(2,0,5)
|
|
|
#define SDL_HAS_ALWAYS_ON_TOP SDL_VERSION_ATLEAST(2,0,5)
|
|
|
@@ -269,7 +274,7 @@ static void ImGui_ImplSDL2_UpdateMousePosAndButtons()
|
|
|
int mouse_x_global, mouse_y_global;
|
|
|
SDL_GetGlobalMouseState(&mouse_x_global, &mouse_y_global);
|
|
|
|
|
|
-#if !defined(__EMSCRIPTEN__)
|
|
|
+#if !defined(__EMSCRIPTEN__) && !defined(__ANDROID__) && !(defined(__APPLE__) && TARGET_OS_IOS)
|
|
|
if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable)
|
|
|
{
|
|
|
// Multi-viewport mode: mouse position in OS absolute coordinates (io.MousePos is (0,0) when the mouse is on the upper-left of the primary monitor)
|
omar