ocornut
|
e05bd9deb9
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdlgpu3.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2026-03-20 16:37:35 +01:00 |
|
ocornut
|
0500e546b5
|
Backends: DX9, Metal, SDLRenderer2/3: fixed more assumptions that ImTextureID_Invald == 0 + Amend Changelogs. (#9310, #9293)
|
2026-03-19 11:47:01 +01:00 |
|
ocornut
|
2a08c87b8c
|
Merge branch '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
# examples/example_glfw_metal/main.mm
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl2_directx11/main.cpp
# examples/example_sdl2_opengl2/main.cpp
# examples/example_sdl2_opengl3/main.cpp
# examples/example_sdl2_sdlrenderer2/main.cpp
# examples/example_sdl2_vulkan/main.cpp
# examples/example_sdl3_directx11/main.cpp
# examples/example_sdl3_opengl3/main.cpp
# examples/example_sdl3_sdlgpu3/main.cpp
# examples/example_sdl3_sdlrenderer3/main.cpp
# examples/example_sdl3_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/example_win32_opengl3/main.cpp
# examples/example_win32_vulkan/main.cpp
# imgui_internal.h
|
2026-01-23 16:05:50 +01:00 |
|
ocornut
|
9ce41a92c3
|
Misc/shallow merges from docking branch to reduce small drift.
|
2026-01-08 14:31:25 +01:00 |
|
ocornut
|
0f7f6284d7
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2025-10-01 18:41:16 +02:00 |
|
ocornut
|
fc4105c8a8
|
Backends: DX9,DX10,DX11,DX12,Metal,Vulkan,WGPU,SDLRenderer2,SDLRenderer3: ensure that a texture in _WantDestroy state always turn to _Destroyed. (#8977)
Amend 9809b0b. Strictly speaking this is not necessary anymore but it seems generally sane to promote this.
|
2025-10-01 17:49:22 +02:00 |
|
ocornut
|
aa9476a38a
|
IO: added ImGuiPlatformIO::ClearPlatformHandlers(), ClearRendererHandlers(). Backends: call those on Shutdown(). (#8945, #2769)
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdlgpu3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.h
|
2025-09-18 17:02:44 +02:00 |
|
ocornut
|
d4f722d5b2
|
IO: added ImGuiPlatformIO::ClearPlatformHandlers(), ClearRendererHandlers(). Backends: call those on Shutdown(). (#8945, #2769)
|
2025-09-18 16:58:50 +02:00 |
|
ocornut
|
fe1cee0837
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
|
2025-07-22 18:38:50 +09:00 |
|
ocornut
|
336d9212fc
|
Backends: using range-for to iterate draw_data->CmdLists[].
|
2025-07-11 17:41:52 +02:00 |
|
ocornut
|
6af6cec23f
|
Merge branch 'master_fonts' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# 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_sdl3.cpp
# backends/imgui_impl_sdlgpu3.cpp
# backends/imgui_impl_sdlgpu3.h
# backends/imgui_impl_vulkan.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl2_directx11/main.cpp
# examples/example_sdl2_opengl2/main.cpp
# examples/example_sdl2_opengl3/main.cpp
# examples/example_sdl2_vulkan/main.cpp
# examples/example_sdl3_opengl3/main.cpp
# examples/example_sdl3_sdlgpu3/main.cpp
# examples/example_sdl3_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2025-06-11 18:07:19 +02:00 |
|
thedmd
|
26c017d5ea
|
Backends: Metal: added ImGuiBackendFlags_RendererHasTextures support.
# Conflicts:
# backends/imgui_impl_metal.h
# backends/imgui_impl_metal.mm
|
2025-06-11 15:41:05 +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
|
d80347613a
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_internal.h
|
2025-02-03 18:42:24 +01:00 |
|
ocornut
|
5dd84082ab
|
InputTextWithHint(): Fixed buffer overflow when user callback modifies the buffer contents in a way that alters hint visibility. (#8368)
|
2025-02-03 15:11:22 +01:00 |
|
ocornut
|
204cebc8fc
|
Backends: Metal: Fixed a crash on application resources. (#8367, #7419) [@anszom]
|
2025-02-03 14:21:53 +01:00 |
|
ocornut
|
d0d571e0d7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui_internal.h
|
2025-01-13 14:30:57 +01:00 |
|
Daniel Walz
|
e7fb97208a
|
Backends: Metal: Added missing IM_UNUSED (#8302)
|
2025-01-09 23:12:07 +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 |
|
Selim Sandal
|
e6a7c7689f
|
Backends: Metal: Fixed memory leaks. (#8276, #8166)
|
2025-01-08 12:03:18 +01:00 |
|
ocornut
|
9cc0bf89bd
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_vulkan.cpp
|
2025-01-06 17:59:22 +01:00 |
|
ocornut
|
d0021e1621
|
Backends: Metal: Fixed resource leak when using multiple contexts. (#7419)
|
2025-01-06 15:01:59 +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
|
368123ab06
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui_draw.cpp
|
2024-11-07 19:58:23 +01:00 |
|
ocornut
|
419a9ada16
|
Ignore clang warning Wnontrivial-memaccess (#8129, #8135)
Amend 88e2327
Use void* cast in backend where the memset are infrequent.
|
2024-11-07 19:08:37 +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 |
|
Maya Warrier
|
88e232739b
|
Ignore clang warning Wnontrivial-memaccess (#8129)
Produced when memset(this, ..) is used on a non-trivially copyable type
|
2024-11-05 10:44:39 +01: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
|
22503bfe75
|
Backends: changed all backends to allow enabling ImGuiConfigFlags_ViewportsEnable after initialization. (#5371)
|
2024-10-08 20:47:24 +02:00 |
|
ocornut
|
c3629adbeb
|
Backends: Metal: fixed ImTextureID cast. (#1641)
Amend 92b9498
|
2024-10-08 14:34:41 +02:00 |
|
ocornut
|
fa9277d12d
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx11.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx12.h
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_wgpu.cpp
# backends/imgui_impl_wgpu.h
# imgui.h
|
2024-10-07 22:05:57 +02:00 |
|
ocornut
|
9bd5d8a240
|
Backends: misc renaming of locals. Use 'draw_list' instead of 'cmd_list'. Avoid using 'ctx'.
This is likely to trigger merging issues. If it does, best to always get "theirs" and rename in there.
|
2024-10-07 17:57:11 +02: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
|
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
|
450f1d7e7b
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2023-11-10 14:56:10 +01:00 |
|
ocornut
|
ab522dd18c
|
Removed IM_OFFSETOF() macro in favor of using offsetof() available in C++11. Kept redirection define. (#4537)
|
2023-11-09 16:44:39 +01:00 |
|
ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
f8f805f046
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx11.cpp
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
|
2023-07-20 23:18:47 +02:00 |
|
ocornut
|
33e13c85e1
|
Backends: Made all backends sources files support global IMGUI_DISABLE. (#6601)
|
2023-07-13 11:27:52 +02:00 |
|
ocornut
|
530134d125
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
|
2023-05-10 12:57:37 +02:00 |
|
Alex
|
70cca1eac0
|
Backends: avoid null dereference in metal and osx shutdown (#6385, #6334)
Co-authored-by: Alexander Rath <alex@ist.besonders.cool>
|
2023-05-04 17:18:29 +02:00 |
|
ocornut
|
1f2b84a654
|
Backends: clear viewport specific bits in io.BackendFlags on backend Shutdown(). (#6334)
Amend 055e715
|
2023-04-19 16:40:18 +02:00 |
|
ocornut
|
4f692ba840
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
|
2023-04-19 16:35:50 +02:00 |
|
Gereon V
|
055e71518e
|
Backends: clear bits set in io.BackendFlags on backend Shutdown(). Clear BackendPlatformName. (#6334, #6335)
Amended with fix for missing clear for ImGuiBackendFlags_HasGamepad.
|
2023-04-17 14:57:12 +02:00 |
|
ocornut
|
bed11b35d1
|
Fix typos and use nullptr in backends. Amend 506f7e0
|
2023-04-11 16:20:17 +02:00 |
|