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 |
|
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
|
02b9797696
|
Backends: SDL3: fixes use of now removed SDL_bool.
|
2024-10-03 11:56:14 +02:00 |
|
ocornut
|
d7cedd648b
|
Backends: SDL2, SDL3: Fixed building for UWP platforms. (#8008)
|
2024-09-23 14:03:36 +02:00 |
|
ocornut
|
10fe2b674a
|
Merge branch 'master' into docking
|
2024-09-20 18:43:48 +02:00 |
|
ocornut
|
0af2c4ef76
|
Backends: SDL3: Update for API changes: SDL_bool removal. SDL_INIT_TIMER removal. (#7999)
|
2024-09-19 16:02:23 +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 |
|
RT2
|
1ab1e3c656
|
Backends: SDL3: rework implementation of ImGuiViewportFlags_NoTaskBarIcon. (#7989)
|
2024-09-17 16:07:42 +02:00 |
|
RT2
|
484764860d
|
Backends: SDL3: added support for viewport->ParentViewportId field to support parenting windows at OS level. (#7973)
|
2024-09-12 19:35:31 +02:00 |
|
ocornut
|
f63c95a076
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-09-04 16:58:44 +02:00 |
|
ocornut
|
6af9ac29ec
|
Backends: SDL3: following SDL3 reverting their change, result of SDL_GetDisplays() must be freed. (#7809)
Reverts 271910e
|
2024-09-03 19:13:45 +02:00 |
|
ocornut
|
4832027eb6
|
Examples: SDL3: Update for API changes: SDL_Init() returns 0 on failure.
|
2024-09-03 19:11:51 +02:00 |
|
Matt Guerrette
|
6a7319543c
|
Backends: SDL3: following SDL3 reverting their change, result of SDL_GetGamepads must be freed. (#7918, #7898, #7807)
|
2024-09-03 18:50:10 +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
|
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
|
271910e349
|
Backends: SDL3: Update for API changes: SDL_GetDisplays() memory ownership change. (#7809)
|
2024-07-22 19:43:59 +02:00 |
|
ocornut
|
3fab2bb7be
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2024-07-22 19:41:39 +02:00 |
|
ocornut
|
eb72b5a8ee
|
Backends: SDL3: Update for API changes: SDL_GetGamepads() memory ownership change. (#7807)
|
2024-07-22 10:49:22 +02:00 |
|
ocornut
|
0e485a2109
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_widgets.cpp
|
2024-07-18 17:56:27 +02:00 |
|
ocornut
|
c2d21ab04f
|
Backends: SDL3: Update for API changes: SDL_GetClipboardText() string ownership change. (#7801)
|
2024-07-18 14:02:27 +02:00 |
|
ocornut
|
5ea96c15cd
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_win32.cpp
|
2024-07-15 11:21:18 +02:00 |
|
ocornut
|
9c2f6003e4
|
Backends: SDL3: fixed typo leading to PlatformHandleRaw not being set leading to SHOWNA path not working for multi-viewports.
|
2024-07-15 11:17:21 +02:00 |
|
wermi
|
df3a74389e
|
Backends: SDL3: Update for API changes: SDL_GetProperty() change to SDL_GetPointerProperty(). (#7794)
|
2024-07-15 11:16:26 +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
|
a489585f84
|
Backends: SDL3: Updated comments (IME seems fixed in SDL3). Added SDL3 examples to Visual Studio solution.
|
2024-07-02 11:37:18 +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
|
3369cbd277
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl3.cpp
|
2024-07-01 17:10:12 +02:00 |
|
Max Ortner
|
ccf3ee674a
|
Backends: SDL3: update for SDL_SetTextInputRect() -> SDL_SetTextInputArea() api change. (#7760, #7754)
|
2024-07-01 12:10:00 +02:00 |
|