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 |
|
Eugene Sandulenko
|
a855bd8df3
|
Backends: SDL2: Replace SDL_Vulkan_GetDrawableSize() forward declaration with the actual include. (#8095, #7967, #3190)
|
2024-10-24 14:52:25 +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 |
|
ocornut
|
d885fe4dd0
|
(Breaking) moved ImGuiConfigFlags_NavEnableSetMousePos -> io.ConfigNavMoveSetMousePos, ImGuiConfigFlags_NavNoCaptureKeyboard -> ConfigNavCaptureKeyboard. (#2517, #2009)
|
2024-10-14 15:29:24 +02:00 |
|
ocornut
|
22503bfe75
|
Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)
|
2024-10-08 20:47:24 +02:00 |
|
ocornut
|
d7cedd648b
|
Backends: SDL2, SDL3: Fixed building for UWP platforms. (#8008)
|
2024-09-23 14:03:36 +02:00 |
|
ocornut
|
bc77cccd31
|
Merge branch 'master' into docking
|
2024-09-19 14:52:43 +02:00 |
|
ocornut
|
42272505c9
|
Backends: ensure that ImGuiPlatformMonitor list is available after backend Init call. (#7995)
|
2024-09-19 14:25:01 +02:00 |
|
ocornut
|
cfae5ac71b
|
Backends: make ImGui_ImplSDL2_KeyEventToImGuiKey(), ImGui_ImplSDL3_KeyEventToImGuiKey(), ImGui_ImplGlfw_KeyToImGuiKey(), ImGui_ImplWin32_KeyEventToImGuiKey(), ImGui_ImplAllegro5_KeyCodeToImGuiKey(), ImGui_ImplOSX_KeyCodeToImGuiKey(), non-static. (#7997)
Backends: Win32: Refactor ImGui_ImplWin32_KeyEventToImGuiKey() logic.
Ref #7672
|
2024-09-19 14:10:00 +02:00 |
|
ocornut
|
68aa9a86ec
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl2.cpp
|
2024-09-10 16:29:14 +02:00 |
|
scribam
|
4236bc088f
|
Backends: SDL2: use SDL_Vulkan_GetDrawableSize with Vulkan instead of SDL_GL_GetDrawableSize. (#7967, #3190)
|
2024-09-09 17:33:28 +02:00 |
|
ocornut
|
fed4841bd4
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-08-22 20:26:59 +02:00 |
|
ocornut
|
214977e5fd
|
IO: (BREAKING) moved io.GetClipboardTextFn, io.SetClipboardTextFn to platform_io.Platform_GetClipboardTextFn, platform_io.Platform_SetClipboardTextFn.
|
2024-08-22 20:12:23 +02:00 |
|
ocornut
|
9ff60ae31d
|
IO: (BREAKING) moved GetIO().PlatformSetImeDataFn to GetPlatformIO(.Platform_SetImeDataFn. (#7660)
|
2024-08-22 20:11:55 +02:00 |
|
ocornut
|
ba2f4a2cd5
|
IO: (BREAKING) moved GetIO().PlatformOpenInShellFn to GetPlatformIO(.Platform_OpenInShellFn. (#7660)
|
2024-08-22 20:11:36 +02:00 |
|
ocornut
|
ea01c63e36
|
Backends: SDL2, SDL3: amend filtering logic for it to work with multi-viewports. (#7853)
|
2024-08-19 14:46:53 +02:00 |
|
ocornut
|
24b077c7f8
|
Merge branch 'master' into docking (multi-viewport broken until next commit)
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
|
2024-08-19 14:44:35 +02:00 |
|
ocornut
|
2d99052d1d
|
Backends: SDL2, SDL3: storing SDL_WindowID inside ImGuiViewport::PlatformHandle instead of SDL_Window*. (#7853)
This will be used to support filtering of events with multi-viewports.
|
2024-08-19 14:43:43 +02:00 |
|
ocornut
|
1b61d55079
|
Backends: SDL2, SDL3: ignore events of other SDL windows, amends + wrapping into a function as it'll be convenient for multi-viewport check. (#7853)
+ Misc typo fix.
|
2024-08-19 14:43:40 +02:00 |
|
Anonymous Maarten
|
591a18a9c4
|
Backends: SDL2, SDL3: ignore events of other SDL windows. (#7853)
|
2024-08-19 13:54:39 +02:00 |
|
ocornut
|
65840c19c4
|
Backends: SDL2, SDL3, Win32: don't submit monitor with 0 DpiScale (e.g. accessibility virtual monitor?). to prevent assert. (#7902)
I am not too confident on this but I believe pushing this is the fastest way we will get feedback.
|
2024-08-19 12:19:06 +02:00 |
|
RT2
|
fa65dcf24c
|
Backends: SDL2, SDL3: Replace Win32 hack with SDL_HINT_WINDOW_ACTIVATE_WHEN_SHOWN hint. (#7896)
|
2024-08-19 12:15:29 +02:00 |
|
ocornut
|
527b2c45af
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl2.cpp
|
2024-07-02 19:05:36 +02:00 |
|
ocornut
|
0ebf49b4c1
|
IO: amend PlatformOpenInShellFn specs to return a bool. (#7660)
Amend 8f36798
|
2024-07-02 19:03:40 +02:00 |
|
ocornut
|
380b3559c6
|
Backends: GLFW,SDL2: Added ioPlatformOpenInShellFn handler for web/Emscripten versions. (#7660)
|
2024-07-02 18:06:19 +02:00 |
|
ocornut
|
3f61da7e8b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-07-02 17:48:38 +02:00 |
|
ocornut
|
fb799bba7f
|
(Breaking) IO, IME: renamed platform IME hook io.SetPlatformImeDataFn() -> io.PlatformSetImeDataFn() and added explicit context.
|
2024-07-02 15:48:32 +02:00 |
|
ocornut
|
ae708e3bcd
|
Backends: SDL3: add default case to fix warnings. (#7763)
|
2024-07-02 12:12:25 +02:00 |
|
ocornut
|
12f92518bc
|
Backends: SDL3: Update for API changes: SDLK_x renames and SDLK_KP_x removals (#7761, #7762)
Also updated function signature in SDL2 backend to match and because it is expected we will use that data (as per #7672)
|
2024-07-02 11:36:13 +02:00 |
|
ocornut
|
32f9dfc126
|
Viewports: Backported 'void* ImGuiViewport::PlatformHandle' from docking branch for use by backends.
|
2024-06-26 14:32:48 +02:00 |
|
ocornut
|
e863f89d39
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-06-20 17:47:22 -07:00 |
|
ocornut
|
eabe98f6d5
|
Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2024-05-14 16:29:06 +02:00 |
|
ocornut
|
5e23680454
|
Backends: all backends + demo now call IMGUI_CHECKVERSION() to verify ABI compatibility between caller code and compiled version of dear imgui. (#7568)
|
2024-05-13 15:07:13 +02:00 |
|
ocornut
|
e391fe2e66
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2024-05-08 16:17:32 +02:00 |
|
ocornut
|
d15574ce2a
|
Backends: Win32: Removed silent return when calling ImGui_ImplWin32_WndProcHandler() with no active context! (#6275)
Better standardized similar checks in other backends.
|
2024-05-07 16:53:03 +02:00 |
|
ocornut
|
77dff5a735
|
Backends: comments.
|
2024-02-28 11:06:40 +01:00 |
|
ocornut
|
d79514c407
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-02-14 14:32:17 +01:00 |
|
ocornut
|
262e30e300
|
Backends: SDL2: rework new API as ImGui_ImplSDL2_SetGamepadMode(). (#3884, #6559, #6890, #7180)
Code is simpler this way.
|
2024-02-14 11:30:43 +01:00 |
|
ocornut
|
d15e4100b8
|
Backends: SDL2: Amend new API, all support for multiple gamepads. (#3884, #6559, #6890)
|
2024-02-13 18:55:14 +01:00 |
|
ocornut
|
f966da1f8f
|
Backends: SDL2: Gamepad handlng: amend bf1c96d. (#3884, #6559, #6890)
|
2024-02-13 16:31:33 +01:00 |
|
ocornut
|
bf1c96d4fa
|
Backends: SDL2: Handle gamepad disconnection + fixed increasing refcount. Added ImGui_ImplSDL2_SelectGamepadAuto()/ImGui_ImplSDL2_SelectGamepadExplicit(). (#3884, #6559, #6890)
|
2024-02-13 16:24:44 +01:00 |
|
ocornut
|
fd8d6dc5d1
|
Backends: SDL2,SDL3: tidying up.
|
2024-02-13 15:49:49 +01:00 |
|
ocornut
|
f7fc186408
|
Merge branch 'master' into docking
+ 2 comments
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
|
2023-10-12 19:22:36 +02:00 |
|