mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-07 20:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,842 Commits 11 Branches 143 Tags
cbf9e3f554e6e3a263f08cb82b14b38beb06016f
Commit Graph

6204 Commits

Author SHA1 Message Date
ocornut
e4bba0b53c Merge branch 'master' into docking 2025-06-24 19:10:26 +02:00
ocornut
89b5a2c3d5 (Breaking) Fonts: removed ImFontFlags_DefaultToLegacySize. 2025-06-24 19:10:10 +02:00
ocornut
97e0d59619 (Breaking) Fonts: removed PushFontSize(), PopFontSize(). 2025-06-24 19:09:51 +02:00
ocornut
ca72eb0596 (Breaking) Fonts: obsolete PushFont() default parameter. 2025-06-24 19:09:28 +02:00
ocornut
7cd567202e Merge branch 'master' into docking 2025-06-24 15:17:29 +02:00
ocornut
6722d789e9 (Breaking) Fonts: Removed support for PushFont(NULL) which was a shortcut for "default font". 2025-06-24 14:44:38 +02:00
ocornut
a49ddaac89 Fonts: add comments and examples for GlyphExcludeRanges[]. 2025-06-24 11:06:41 +02:00
ocornut
4fde473f38 Backends: warning fixes (for docking branch). 2025-06-20 15:24:52 +02:00
ocornut
344d5ff4b7 Merge branch 'master' into docking 2025-06-17 20:15:12 +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
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
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
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
e8f831deaa Merge branch 'master' into docking 2025-06-12 11:07:42 +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
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
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
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
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
ocornut
2d2b1cee6b Fonts: internals: renamed g.FontSizeBeforeScaling to g.FontSizeBase for consistency. 
# Conflicts:
#	imgui_internal.h
 2025-06-11 16:10:45 +02:00
ocornut
3c27c643a9 Fonts: internals: renamed g.FontScale to g.FontBakedScale for clarity. Comments. 2025-06-11 16:10:18 +02:00
ocornut
d85e22d205 Added style.FontScaleDpi which is the field overwritten by ImGuiConfigFlags_DpiEnableScaleFonts. 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
 2025-06-11 16:09:56 +02:00
ocornut
8766efcba6 (Breaking) Renamed io.FontGlobalScale to style.FontScaleMain. 
# Conflicts:
#	imgui.cpp
 2025-06-11 16:07:21 +02:00
ocornut
80c08f2286 (Breaking) Fonts: obsoleting SetWindowFontScale(). 
+ Comments

# Conflicts:
#	imgui.cpp
 2025-06-11 16:07:05 +02:00
ocornut
59a11363a5 Fonts: ground work for allowing SizePixels to be optional. 2025-06-11 16:06:24 +02:00
ocornut
1e118ab891 Fonts: added ImGuiStyle::FontSizeBase. Ensuring PushFontSize() works before main loop and across NewFrame(). 
# Conflicts:
#	imgui.cpp
 2025-06-11 16:06:21 +02:00
ocornut
b029be6b6c Fonts: avoid calling GetFontBaked() during SetFontSize(). Also fixes loading extraneous baked on atlas that will be locked 
e.g. PushFontSize() before NewFrame() on legacy backend.
 2025-06-11 16:06:00 +02:00
ocornut
033cdc4133 Fonts: comments and slight packing of ImFontConfig fields. 2025-06-11 16:06:00 +02:00
ocornut
69547bd4bd Fonts: ImFont::DefaultSize -> ImFont::LegacySize. ImFontFlags_UseDefaultSize -> ImFontFlags_DefaultToLegacySize. 2025-06-11 16:06:00 +02:00
ocornut
e3860aa6ac (Breaking) Fonts: removing obsolete ImFont::Scale. 2025-06-11 16:05:54 +02:00
ocornut
25f9c318e3 Fonts: added "Input Glyphs Overlap Detection Tool". Added "Clear bakes", "Clear unused" buttons. Move code. 2025-06-11 16:05:54 +02:00
ocornut
5926c877a1 Fonts: detect if ImFontAtlasUpdateNewFrame() is not being called. 2025-06-11 16:05:54 +02:00
ocornut
b2343d6247 Fonts: fallback to default default rasterizer density + pick one from existing viewports at the time of calling AddUpdateViewport(). 
# Conflicts:
#	imgui.cpp
 2025-06-11 16:05:33 +02:00
ocornut
f3780c7354 Fonts: adding GetFontBaked() in public API. 2025-06-11 16:02:10 +02:00
ocornut
5ee9845559 Fonts: automatically set current rasterizer density to viewport density. Effectively should fix most things on macOS. 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2025-06-11 16:02:09 +02:00
ocornut
39f6c793b3 Fonts: proof of concept support for user textures. 
# Conflicts:
#	imgui.h
#	imgui_internal.h
 2025-06-11 15:59:19 +02:00
ocornut
91ed6e67b4 Fonts: fixed support for multiple atlases. 
Moved FontAtlasOwnedByContext to OwnerContext

# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2025-06-11 15:58:29 +02:00
ocornut
fad5280d4c Fonts: fixed broken support for legacy backend due to a mismatch with initial pre-build baked id. 2025-06-11 15:57:44 +02:00
ocornut
46fa9e8efb Fonts: Debug display status. Fixed truncated raw texture id. Fixed FormatTextureIDForDebugDisplay(). Comments. 2025-06-11 15:57:35 +02:00
ocornut
b32ef3c05d Fonts: make RasterizerDensity a dynamic field. (temporarily exposed as SetFontRasterizerDensity()). 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2025-06-11 15:57:35 +02:00