ocornut
|
c008c7d494
|
Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2025-05-15 14:45:15 +02:00 |
|
ocornut
|
c90ea1315a
|
Viewports: added per-viewport FramebufferScale, Platform_GetWindowFramebufferScale() + Backends: GLFW, SDL2, SDL3, Apple: added support. (#1065, #1542, #1676, #1786, #2826, #3757, #5081, #5580, #5592, #6465, #7273, #7779 etc.)
)
Metal backend is not in charge of writing to DpiScale/FramebufferScale (tho it was a neat workaround).
|
2025-05-15 14:43:30 +02:00 |
|
ocornut
|
08689c51a9
|
Backends: GLFW, SDL2, SDL3: include GLFW/SDL version number in io.BackendPlatformName.
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2025-05-13 15:50:51 +02:00 |
|
ocornut
|
4a6ba95392
|
Backends: SDL3: Comments (#6146)
|
2025-05-12 19:19:30 +02:00 |
|
ocornut
|
ef62aa7333
|
Backends: SDL3: macOS: Fixed secondary-viewports not appearing on a different monitor than the main viewport.
|
2025-05-05 19:04:18 +02:00 |
|
ocornut
|
fe298cf984
|
Revert "Backends: SDL2, SDL3: viewports created with ImGuiViewportFlags_NoInputs are passing SDL_WINDOW_TOOLTIP to SDL_CreateWindow(). (#8576)"
This reverts commit 2a000ee091.
|
2025-04-25 20:10:46 +02:00 |
|
ocornut
|
2a000ee091
|
Backends: SDL2, SDL3: viewports created with ImGuiViewportFlags_NoInputs are passing SDL_WINDOW_TOOLTIP to SDL_CreateWindow(). (#8576)
Which reduces issues related to losing key down state on focus loss.
|
2025-04-23 19:12:32 +02:00 |
|
ocornut
|
f53de38e1f
|
Viewports, Backends: Debug logging.
|
2025-04-23 16:47:00 +02:00 |
|
ocornut
|
839e3274e1
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
|
2025-04-23 14:42:36 +02:00 |
|
ocornut
|
bf0f586b69
|
Platform IME: added ImGuiPlatformImeData::WantTextInput, ViewportId. Backends: SDL3: honor WantTextInput. (#8584, #7492, #6341)
|
2025-04-22 11:21:02 +02:00 |
|
ocornut
|
06c2c9f456
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2025-04-09 19:08:45 +02:00 |
|
Zane van Iperen
|
74e453cf15
|
Backends: SDL2, SDL3: don't attempt to call SDL_CaptureMouse() on drivers where we don't call SDL_GetGlobalMouseState(). (#8561)
|
2025-04-09 14:58:32 +02:00 |
|
ocornut
|
b811c42034
|
Backends: SDL2/SDL3: revert updating monitors and work area info every frame. Workaround for Windows. (#8415, #8558)
Partly revert logic from 1a7b5945c7.
|
2025-04-09 14:28:43 +02:00 |
|
ocornut
|
df5690d91a
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2025-03-30 16:42:28 +02:00 |
|
Green Sky
|
5c9fb8f064
|
Backends: SDL3: Update for API changes: Revert SDL_GetClipboardText() memory ownership change. (#8530, #7801)
see https://github.com/libsdl-org/SDL/pull/10390
|
2025-03-30 13:52:39 +02:00 |
|
ocornut
|
979c7d76ab
|
Backends: SDL2, SDL3, OSX: Fill gamepad inputs and set ImGuiBackendFlags_HasGamepad regardless of ImGuiConfigFlags_NavEnableGamepad being set. (#8508)
|
2025-03-21 15:42:47 +01:00 |
|
ocornut
|
aa97252f60
|
Merge branch 'master' into docking
# Conflicts:
# imgui_internal.h
|
2025-03-13 21:01:21 +01:00 |
|
ocornut
|
51e4cba909
|
Backends: Fixed zealous warnings.
|
2025-03-11 12:05:23 +01:00 |
|
ocornut
|
6972b6c380
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
|
2025-03-10 20:02:36 +01:00 |
|
ocornut
|
a9e53829d2
|
Backends: Win32, SDL2, SDL3, GLFW: prioritize scancodes instead of translated keycodes when dealing with OEM keys + Added ImGuiKey_Oem102. (#7136, #7201, #7206, #7306, #7670, #7672, #8468)
|
2025-03-10 18:01:29 +01:00 |
|
ocornut
|
3fb14b50f8
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2025-02-26 21:08:45 +01:00 |
|
ocornut
|
aa83d5d455
|
Backends: SDL2, SDL3: Only start SDL_CaptureMouse() when mouse is being dragged. (#6410, #3650)
To mitigate issues with e.g. Linux debuggers not claiming capture back.
|
2025-02-26 15:34:31 +01:00 |
|
ocornut
|
2db3e9d439
|
Backends: SDL2, SDL3: Use display bounds when SDL_GetDisplayUsableBounds() fails or return a zero size. (#8415, #3457)
Analoguous to aa8e09d7f1 for GLFW.
|
2025-02-25 17:11:56 +01:00 |
|
ocornut
|
9ab0b66f50
|
Backends: fixed comment to state that ImGuiViewport::PlaformHandle is used to store SDL's WindowID, not SDL_Window*. (#7853)
Amend 2d99052
|
2025-02-25 15:55:54 +01:00 |
|
TheMode
|
dac40d0487
|
Backends: SDL2, SDL3: don't call SDL_GetGlobalMouseState() when mouse position is in relative mode. (#8425, #8407)
|
2025-02-24 12:26:48 +01:00 |
|
ocornut
|
773060155f
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.h
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2025-02-21 19:56:20 +01:00 |
|
ocornut
|
1a7b5945c7
|
Backends: GLFW/SDL2/SDL3: Update monitors and work areas information every frame, as the later may change regardless of monitor changes. (#8415)
|
2025-02-21 19:23:39 +01:00 |
|
ocornut
|
eec097fe35
|
Added ImGuiMouseCursor_Progress mouse cursor 8a35386+ support in SDL2,SDL3,Win32,Allegro5 backends.
Amend 8a35386
|
2025-02-18 18:52:08 +01:00 |
|
ocornut
|
8a35386ba7
|
Added ImGuiMouseCursor_Wait mouse cursor (busy/wait/hourglass shape) + support in SDL2,SDL3,Win32,Allegro5 backends.
|
2025-02-18 18:40:47 +01:00 |
|
ocornut
|
71d39a4634
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_internal.h
|
2025-02-12 19:17:48 +01:00 |
|
ocornut
|
a431e1277e
|
Backends: SDL2, SDL3: Using SDL_OpenURL() in platform_io.Platform_OpenInShellFn handler. (#7660)
|
2025-02-10 12:09:44 +01:00 |
|
David Maas
|
a3802c84fd
|
Backends: SDL3: new viewport windows are created with the SDL_WINDOW_HIDDEN flag before calling SDL_ShowWindow(). (#8328
Unsure why it was missing from a526ff8c3
|
2025-01-22 10:02:24 +01:00 |
|
ocornut
|
6e94f6cefb
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_internal.h
|
2025-01-20 18:04:31 +01:00 |
|
ocornut
|
4c2e7bb035
|
Backends: SDL2,SDL3: removed assert preventing using ImGui_ImplSDL2_SetGamepadMode()/ImGui_ImplSDL3_SetGamepadMode() with ImGui_ImplSDL2_GamepadMode_Manual/ImGui_ImplSDL3_GamepadMode_Manual and an empty array. (#8329)
|
2025-01-20 15:24:46 +01:00 |
|
ocornut
|
8b0af7fddc
|
Backends: SDL: update comments regarding API stability, regarding SDL_GPU and SDL_Renderer.
|
2025-01-20 14:30:40 +01:00 |
|
ocornut
|
c0ae3258f9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2025-01-14 13:46:39 +01:00 |
|
ocornut
|
6fb7d44255
|
Backends: SDL2/SDL3: Comments. (#7672, #7670)
|
2025-01-13 17:40:38 +01:00 |
|
ocornut
|
2f91176011
|
Merge branch 'master' into docking
|
2025-01-09 17:08:31 +01:00 |
|
ocornut
|
596e09770d
|
Backends: SDL3: Added ImGui_ImplSDL3_InitForSDLGPU() for consistency. (#8163, #7998, #7988)
|
2025-01-09 17:07:53 +01:00 |
|
ocornut
|
960a6f14bf
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_metal.mm
# imgui.cpp
|
2025-01-08 14:36:14 +01:00 |
|
ocornut
|
a9cd0f5e42
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_allegro5.cpp
# backends/imgui_impl_allegro5.h
# backends/imgui_impl_android.cpp
# backends/imgui_impl_android.h
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl2.h
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_opengl3.h
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
2024-12-11 12:27:25 +01:00 |
|
ocornut
|
43fbd7ce84
|
Backends: standardized top of file comments.
|
2024-12-05 12:43:04 +01:00 |
|
ocornut
|
566558b17c
|
Replacing NULL with nullptr in examples/backends when they creeped back. (#6313, #7071, #4537)
|
2024-12-05 12:25:02 +01:00 |
|
ocornut
|
83660e37e3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glut.cpp
# backends/imgui_impl_glut.h
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_demo.cpp
|
2024-11-06 17:58:35 +01:00 |
|
ocornut
|
6f287dd16d
|
(Breaking) Removed pre-1.87 obsolete io.KeyMap[], io.KeysDown[], io.NavInputs[]. Remove IMGUI_DISABLE_OBSOLETE_KEYIO. (#4921)
|
2024-11-06 17:54:59 +01:00 |
|
ocornut
|
942b64abfc
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-10-24 18:15:51 +02:00 |
|
ocornut
|
a908d73c16
|
Backends: avoid missing -Wmissing-declaration warning. (#8087, #7997)
|
2024-10-24 17:24:47 +02:00 |
|
Ronan Cailleau
|
943e26b16b
|
Backends: SDL3: secondary viewports SDL_WindowFlags only inherit SDL_WINDOW_HIGH_PIXEL_DENSITY from the main window. (#8098, #2306)
Amend a526ff8c (#6146)
|
2024-10-24 17:14:10 +02:00 |
|
ocornut
|
06092a9756
|
Backends: SDL2, SDL3: SDL_EVENT_MOUSE_WHEEL event doesn't require dividing by 100.0f on Emscripten. (#4019, #6096, #1463)
Ref https://github.com/libsdl-org/SDL/issues/10454#issuecomment-2434187317
|
2024-10-24 14:47:23 +02:00 |
|
ocornut
|
514a97a9b7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx11.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx12.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdlrenderer2.cpp
# backends/imgui_impl_sdlrenderer2.h
# backends/imgui_impl_sdlrenderer3.cpp
# backends/imgui_impl_sdlrenderer3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
|
2024-10-14 19:23:23 +02:00 |
|