Commit Graph

11047 Commits

Author SHA1 Message Date
PlayDay
725d185a31 Backends: DirectX12: fixed build on MinGW. (#8702, #4594) 2025-06-19 20:10:39 +02:00
ocornut
2a8c75f3e6 Backends: GLFW: amend for multi-context support with multi-viewport. (#8676, #8239, #8069) 2025-06-18 17:01:49 +02:00
ocornut
c2c38beec8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
2025-06-18 16:55:20 +02:00
ocornut
f633a60581 Backends: GLFW: Added support for multiple Dear ImGui contexts. (#8676, #8239, #8069) 2025-06-18 16:46:37 +02:00
ocornut
d290e583c5 Backends: GLFW: fixed WndProc relying on current context. (#8676, #8239, #8069)
This makes the backend closer to support multi-context.
2025-06-18 16:39:57 +02:00
ocornut
c56e8b4964 imgui_freetype: fixed NULL that creeped in instead of nullptr. 2025-06-18 15:31:00 +02:00
ocornut
344d5ff4b7 Merge branch 'master' into docking 2025-06-17 20:15:12 +02:00
ocornut
b2c73596ae InputText: fixed a buffer overrun that could happen when using dynamically resizing buffers. (#8689) 2025-06-17 20:11:22 +02:00
ocornut
12626b85c4 InputText: minor changes to match for both insert chars paths to look more similar. 2025-06-17 19:24:45 +02:00
ocornut
08bb348142 Misc: removed static linkage from operators to facilitate using in C++ modules. (#8682, #8358) 2025-06-17 17:09:26 +02:00
ocornut
041abe8522 Revert "Misc: removed static linkage from operators to facilitate using in C++ modules. (#8682, #8358) [@radjkarl]"
This reverts commit 39a90ac4d6.
2025-06-17 14:57:39 +02:00
ocornut
39a90ac4d6 Misc: removed static linkage from operators to facilitate using in C++ modules. (#8682, #8358) [@radjkarl] 2025-06-17 14:52:34 +02:00
ocornut
f2e4e80391 Windows: BeginChild(): fixed being unable to combine manual resize on one axis and automatic resize on the other axis. (#8690)
+ removed obsolete TODO entries.
2025-06-17 14:01:01 +02:00
ocornut
fe048efeab DrawList, Fonts: fixed PushFont()/AddImage() not restoring correct atlas texture id when using multiple atlas (#8694)
This also needs 24f7328.
2025-06-17 12:06:14 +02:00
ocornut
24f7328e5f DrawList, Fonts: fixed ImFontAtlasTextureRepack() overwriting draw list shared data UV's etc. even when not bound. (#8694, #8465)
ImFontAtlasUpdateDrawListsSharedData() call from ImFontAtlasTextureRepack() would trigger this.
For simplicity we also track current atlas in ImDrawListSharedData, but we could probably use Font->ContainerAtlas.
2025-06-17 12:06:05 +02:00
Pascal Thomet
842837e35b imgui_freetype: fix conversion null -> bool in FontBakedLoadGlyph (#8696) 2025-06-16 18:36:33 +02:00
Shawn Hatori
6b3cbb10a2 Backends: Vulkan: correct minimum pool size assertion (#8691) 2025-06-16 11:59:26 +02:00
ocornut
d896eab166 Backends: OSX: ImGui_ImplOSX_HandleEvent() only process event for window containing our viewports. Amend 7ac99a4 for docking. (#8644) 2025-06-13 17:48:20 +02:00
ocornut
4cf85ee543 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
2025-06-13 17:43:30 +02:00
ocornut
cfa43e721a Windows: clicking on a window close button doesn't claim focus and bring to front. (#8683)
Added ImGuiItemFlags_NoFocus, ImGuiButtonFlags_NoFocus. Neither are well specified so marking as experimental.
2025-06-13 17:40:17 +02:00
ocornut
d8da97f756 Fonts: UpdateCurrentFontSize() early out doesn't need to clear FontBaked.
This was meant when the code would be lower in the function (after updating e.g. g.FontSize) Amend 0e769c5.
2025-06-13 16:47:23 +02:00
ocornut
ca3169310e Fonts: fixed FontBaked=NULL in initial call to SetCurrentWindow() in Begin() using previous frame value of SkipItems. (#8465)
ref 0e769c5
2025-06-13 16:46:41 +02:00
ocornut
1ec1510ef7 Fonts: clarify assert. (#8680) 2025-06-12 16:49:47 +02:00
ocornut
7ac99a4366 Backends: OSX: ImGui_ImplOSX_HandleEvent() only process event for window containing our view. (#8644) 2025-06-12 15:44:18 +02:00
ocornut
b7f13df130 Docs: reformat Changelog. 2025-06-12 15:42:51 +02:00
ocornut
571dae9664 Backends: WGPU: added ImGuiBackendFlags_RendererHasTextures support. (#8465) 2025-06-12 15:31:51 +02:00
ocornut
b178fd4286 Backends: WebGPU: moved sampler creation out of ImGui_ImplWGPU_CreateFontsTexture(). 2025-06-12 14:55:46 +02:00
ocornut
115a8e74c2 Fonts: update misc comments, docs. 2025-06-12 14:18:23 +02:00
ocornut
41f4acfb4f Fonts: add has_textures parameters to ImFontAtlasUpdateNewFrame(). 2025-06-12 11:44:11 +02:00
ocornut
7b8e000133 Fixed duplicate symbols in some compile-time configurations. 2025-06-12 11:28:35 +02:00
ocornut
1ce75e2bca Fixed duplicate symbols in some compile-time configurations. 2025-06-12 11:25:15 +02:00
ocornut
e8f831deaa Merge branch 'master' into docking 2025-06-12 11:07:42 +02:00
ocornut
f6fc166584 TreeNode: fixed runtime asan warning (#2920)
imgui_widgets.cpp:6923:52: runtime error: shift exponent -1 is negative
2025-06-12 11:07:08 +02:00
ocornut
a0b3eceec7 Fixed using IMGUI_DISABLE_DEMO_WINDOWS without IMGUI_DISABLE_DEBUG_TOOLS and without linking with imgui_demo.cpp 2025-06-12 11:02:32 +02:00
ocornut
7d70c0ff9f Merge branch 'master' into docking 2025-06-11 20:53:33 +02:00
ocornut
7a42233d43 imgui_freetype: fixed using legacy names. 2025-06-11 20:47:17 +02:00
ocornut
895bff6524 Removed unneeded check in RenderText() loop + disable static analyzer false-positive warnings. 2025-06-11 19:17:34 +02:00
ocornut
e43fd75378 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_sdlgpu3.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.cpp
2025-06-11 19:04:44 +02:00
ocornut
df068ce11e Various/misc fixes following back-and-forth dynamic_fonts->master->docking merges. Added missing API BREAKING CHANGES section. 2025-06-11 18:50:16 +02:00
ocornut
e4055e763f Fonts: Misc merge fixes. 2025-06-11 18:12:42 +02:00
ocornut
1e130e045b Examples: set ConfigDpiScaleFonts / ConfigDpiScaleViewports in all examples already setup for scaling. 2025-06-11 18:11:32 +02:00
ocornut
65857236c7 Backends: GLFW, SDL2, SDL3, update for docking to use helpers. 2025-06-11 18:07:43 +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
ocornut
96be957315 Docs: update Changelog, FAQ, Fonts docs. 2025-06-11 17:40:10 +02:00
ocornut
4acce85656 Fonts: tweaks demo and exposure to sliders, etc. 2025-06-11 17:36:28 +02:00
ocornut
cc3d4cab21 (Breaking) renamed ImFontConfig::FontBuilderFlags -> FontLoaderFlags. ImFontAtlas::FontBuilderFlags -> FontLoaderFlags. ImGuiFreeTypeBuilderFlags -> ImGuiFreeTypeLoaderFlags. 2025-06-11 16:42:31 +02:00
ocornut
e1481a731d Fonts: fixed NewFrame() when atlas builder has been created but fonts not added. Fixed GetCustomRect() after atlas clear. 2025-06-11 16:25:18 +02:00
ocornut
29fbf3c1ec Fonts: demote ImFont::GetFontBaked() as slighty internal. 2025-06-11 16:25:17 +02:00
ocornut
0e769c5418 Fonts: amend UpdateCurentFontSize() early out optimization. 2025-06-11 16:25:13 +02:00
ocornut
573f08135d Fonts: fixed PopFont() broken recovery.
"misc_recover_1" test would assert in EndFrame()
2025-06-11 16:25:10 +02:00