mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-21 10:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,842 Commits 9 Branches 145 Tags
cbf9e3f554e6e3a263f08cb82b14b38beb06016f
Commit Graph

3338 Commits

Author SHA1 Message Date
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
96be957315 Docs: update Changelog, FAQ, Fonts docs. 2025-06-11 17:40:10 +02:00
ocornut
cc3d4cab21 (Breaking) renamed ImFontConfig::FontBuilderFlags -> FontLoaderFlags. ImFontAtlas::FontBuilderFlags -> FontLoaderFlags. ImGuiFreeTypeBuilderFlags -> ImGuiFreeTypeLoaderFlags. 2025-06-11 16:42:31 +02:00
ocornut
29fbf3c1ec Fonts: demote ImFont::GetFontBaked() as slighty internal. 2025-06-11 16:25:17 +02:00
ocornut
02f58b3207 Fonts: AddFont() functions now allow size_pixels==0.0f (only required when using certain functions) 
Fonts: AddFont() funcitons allow size_pixels==0 for merged fonts.
 2025-06-11 16:24:48 +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
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
83aad81279 Fonts: comments + made IMGUI_DEBUG_LOG_FONT() work without an ImGui context. 2025-06-11 16:02:10 +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
ea756ede16 Fonts: reorder ImFontFlags according likelihood of being useful. 2025-06-11 15:59:20 +02:00
ocornut
1b51a88bba Fonts: moved compare operators to internal. Removed commented out ones aimed legacy backends: not needed anymore since we didn't rename ImTextureID. 2025-06-11 15:59:20 +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
f6735c223c Fonts: remove ImFontHooks in favor of a AddRemapChar() implementation. 2025-06-11 15:57:35 +02:00
ocornut
89e880dfd1 Fonts: adding ImFontHooks for codepoint remapping. 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
ocornut
8140a9d8a6 Fonts: comments on ImTextureData fields. 2025-06-11 15:57:35 +02:00
ocornut
2b0d49a905 Fonts: make ImFont::Sources a vector. 
Later it should become a ImSpan<>
 2025-06-11 15:57:23 +02:00
ocornut
e7efe94fd2 Fonts: shallow rework of ImFontAtlasBakedAddFontGlyph() to facilitate upcoming change. 2025-06-11 15:57:23 +02:00
ocornut
c4fa9bb61f Fonts: add ImFontGlyph::SourceIdx. Extract code out of DebugNodeFont() into DebugNodeFontGlyphesForSrcMask(). 
(src_mask unused in this commit)
 2025-06-11 15:57:23 +02:00
ocornut
bcd1a94b89 Fonts: Extract ImFontAtlasBuildGetFontBaked() out of ImFont::GetFontBaked() mostly for consistency with upcoming changes + tweak locals in AddFont(). 2025-06-11 15:57:23 +02:00
ocornut
ed2bb2cff0 Fonts: encode additional data in ImFontAtlasRectId to detect invalid id + added Rects debug browser. 2025-06-11 15:56:39 +02:00
ocornut
12599da53d Fonts: do not mark whole ImTextureData struct as IMGUI_API to fix warning when used in ImVector<> (8559) 2025-06-11 15:56:38 +02:00
ocornut
1ea9ff3677 Fonts: add optional out parameter to AddCustomRect() 2025-06-11 15:56:24 +02:00
ocornut
23dc46c4f8 Fonts: added RemoveCustomRect(). 
+ internally add ImFontAtlasPackReuseRectEntry()
 2025-06-11 15:56:24 +02:00
ocornut
e9cf3de58f Fonts: moved ImFontAtlasRectId back to public API. 2025-06-11 15:56:24 +02:00
ocornut
db30e1b5b6 (Breaking) Fonts: rework GetCustomRect() api. Reintroduce ImFontAtlasRect. 2025-06-11 15:55:51 +02:00
ocornut
f40274702d (Breaking) Fonts: renamed AddCustomRectRegular() -> AddCustomRect(). 2025-06-11 15:55:51 +02:00
ocornut
253dff7656 Fonts: Comments. 2025-06-11 15:55:38 +02:00
ocornut
44498825cd (Breaking) Fonts: PushFont() default to preserve current font size. 2025-06-11 15:54:53 +02:00
ocornut
5460903f96 Fonts: awkwardly alias old TexID name to TexRef using an union (may backtrack and just keep old name) 2025-06-11 15:54:26 +02:00
ocornut
a548cd9934 Fonts: avoid both ImTextureRef fields being set simultaneously. 2025-06-11 15:54:12 +02:00
ocornut
0fff7ceda4 Fonts: comments, tweaks, minor amends. 
Comments, tweaks
 2025-06-11 15:53:42 +02:00
ocornut
e41bf16ff1 Fonts: fixed ImTextureID() being zero-cleared instead of using ImTextureUserID_Invalid. . 2025-06-11 15:53:42 +02:00
ocornut
8bd1fc4f04 Textures: Added ImTextureRef::GetTexID() mostly for consistency. 
Without it the logic may seem more confusing to grok for end-user.
 2025-06-11 15:53:42 +02:00
ocornut
41517bca0c (Breaking) Fonts: renamed CalcCustomRectUV() to GetCustomRectUV() for simplicity. 2025-06-11 15:52:21 +02:00
ocornut
f816b861fc (Breaking) Fonts: rename GetCustomRectByIndex() to GetCustomRect(). Made return struct const. 2025-06-11 15:52:12 +02:00
ocornut
85d0507580 Fonts: narrowed invalid value for ImFontAtlasRectId to -1 a we will change implementation. 2025-06-11 15:52:12 +02:00