317 Commits

Author SHA1 Message Date
ocornut
1ab953d75a Merge branch 'master' into docking 2026-11-03 20:07:10 +01:00
Miloš Đorđević
7ee4dbac89
imgui_freetype: fixed undefined float to integer conversion when de-multiplying a color glyph with a color above its alpha. (#9599) 2026-11-02 14:27:23 +01:00
ocornut
d88f238d1d Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2026-10-15 18:47:51 +02:00
ocornut
cbe3d5fb88 Version 1.93.1 WIP 2026-10-15 14:34:31 +02:00
ocornut
0f4b927e81 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
2026-10-05 19:42:50 +02:00
ocornut
09d740ba32 (Breaking) Fonts: refactor ImFontLoader to allow loading from glyph_index. (#9559, #5647)
cc #9540, #8466, #8465
2026-09-30 18:39:11 +02:00
ocornut
64944b4520 Merge remote-tracking branch 'origin/master' into docking
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h
2026-09-25 15:38:34 +02:00
ocornut
aa0181478b imgui_freetype: tweak rounding code. (#9348, #9233) 2026-09-25 14:22:08 +02:00
ocornut
5c6a86a9d2 imgui_freetype: fixed ExtraSizeScale (used by embedded ProggyForever) leading to non-pixel aligned vertical offset. (#9348, #9233) + Added ImRoundPositive64(), ImRoundSigned64(). 2026-09-25 14:22:08 +02:00
ocornut
7e1b65d26d Merge branch 'master' into docking
# Conflicts:
#	imgui_internal.h
2026-09-02 17:27:51 +02:00
ocornut
e2e9533991 Added IM_NODEBUGSTEP helper. Tagged ImVec2, ImVec4, ImRect and various operators.
cc #3038. Amend 1bc6f82091, 301c956039
2026-09-02 17:13:47 +02:00
ocornut
1e51b6ffdc Comments/fixes about using IMGUI_DEFINE_MATH_OPERATORS in imconfig.h (#9524) 2026-08-28 12:40:14 +02:00
ocornut
fd13a1e892 Merge branch 'master' into docking
# Conflicts:
#	examples/example_apple_opengl2/main.mm
2026-08-19 13:39:46 +02:00
ocornut
5de45fb1d9 Trim trailing white spaces. Changes some NULL to nullptr. 2026-08-07 16:00:53 +02:00
ocornut
329c5a6b3b Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_sdl2.cpp
2026-04-16 15:29:57 +02:00
ocornut
3cd8683061 Fonts: assert when using MergeMode with an explicit size over a target font with an implicit size, as scale factor are likely erroneous. (#9361) 2026-04-13 16:45:18 +02:00
ocornut
bbcc83e999 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
2026-04-08 21:40:40 +02:00
ocornut
7cb0baeb77 imgui_freetype: add FreeType headers & compiled version number in the 'About Dear ImGui' user facing string. 2026-04-07 17:18:16 +02:00
ocornut
3fb22b836b Merge branch 'master' into docking 2026-02-12 20:08:03 +01:00
ocornut
041cdddf35 Fonts: add new ProggyForever font!
Amend f006400
2026-02-12 20:06:33 +01:00
ocornut
42f28ba305 Fonts: avoid baking ExtraSizeScale twice into Ascent/Descent. (re)
Reapply 1bcc23e + offset for our current internal font using it.
2026-02-11 20:26:14 +01:00
ocornut
c71b2a1fe6 Revert "Fonts: avoid baking ExtraSizeScale twice into Ascent/Descent."
This reverts commit 1bcc23ef123869240971427902b32109c8157e24.
2026-02-10 17:56:37 +01:00
ocornut
1bcc23ef12 Fonts: avoid baking ExtraSizeScale twice into Ascent/Descent.
Amend 55ad3b4
With extreme values of ExtraSizeScale offset would be noticeable in Descent - TextLink() function - or Ascent - TableAngledHeadersRow() function.
2026-02-05 16:52:04 +01:00
ocornut
396b33d0d0 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2025-12-23 18:19:15 +01:00
ocornut
f006400f05 Fonts: added AddFontDefaultVector() with embedded ProggyVector data. 2025-12-23 18:16:33 +01:00
ocornut
73dd0e869d (Breaking) Fonts: remove ImFontConfig::PixelSnapV. Post-rescale GlyphOffset is always rounded.
Amend 99f6b305c, 99bca397d8.
2025-12-23 18:16:33 +01:00
ocornut
55ad3b4abd Fonts: added ExtraSizeScale feature (undocumented). 2025-12-23 18:16:32 +01:00
ocornut
9055c9ed22 imgui_freetype: fixed overwriting ImFontConfig::PixelSnapH when hinting is enabled.
Fix/amend 99f6b305c1.
2025-12-22 17:52:32 +01:00
ocornut
772cbfd014 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
2025-11-26 14:33:25 +01:00
ocornut
98636f4a23 Fonts: fixed handling of ImFontConfig::FontDataOwnedByAtlas = false which did erroneously make a copy of the font data. (#9086)
Amend 815168c7e
+ Added explicit casts for intent/clarity when passing to stb_truetype/freetype.
2025-11-24 15:58:01 +01:00
ocornut
3109131a88 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	imgui.cpp
#	imgui_internal.h
2025-11-06 18:11:16 +01:00
ocornut
dacd080639 Docs: added link to imgui-module. (#8868( 2025-11-06 17:30:00 +01:00
ocornut
42015f7194 Merge branch 'master' into docking
incl/ viewport fix for #9054
2025-11-05 19:18:46 +01:00
Brenton Bostick
a3546b52f8
Various typo fixes (#9042) 2025-11-03 13:26:12 +01:00
ocornut
db577cd445 Fonts: rename internal fields for consistency. 2025-10-31 16:38:23 +01:00
ocornut
1d942eb6c9 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
2025-10-30 18:08:56 +01:00
ocornut
a1632c6116 InputText, Demo: amend comments to direct more users to the std::string version.
https://www.youtube.com/watch?v=pLwvNdpTpjs wasted a solid hour before finding this.
Crazy that people are using AI instead of actually _reading_ comments, demo and headers. (The information appeared multiple times on their screen)
2025-10-24 17:10:57 +02:00
ocornut
f9571ce4d3 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
2025-10-13 15:13:06 +02:00
ocornut
bee2720faa Docs: clarify meaning/purpose of IMGUI_ENABLE_FREETYPE. (#8993) 2025-10-08 18:44:07 +02:00
ocornut
e285ecca09 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_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.cpp
#	imgui.h
2025-09-24 14:54:46 +02:00
ocornut
46e6382b69 Added type formatters for the LLDB debuggers (e.g. Xcode, Android Studio) (#8950) 2025-09-22 12:26:53 +02:00
David Mentler
087fbf08f6 Added type formatters for the LLDB debuggers (e.g. Xcode) (#8950) 2025-09-22 12:25:17 +02:00
ocornut
160e3683ab Merge branch 'master' into docking 2025-08-13 17:31:15 +02:00
Wouter Vermaelen
863e989c25
imgui_freetype.cpp: fix gcc -Wmissing-declarations (#8879) 2025-08-11 19:39:26 +02:00
ocornut
c99ac2451f Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_vulkan.cpp
2025-07-08 17:25:22 +02:00
Matthew Pohlmann
0448428322 Fonts: Change ImFontConfig::FontNo back to int from S8 (#8775)
When used with FreeType this value is passed as `face_index` which needs to be 32-bits.

# Conflicts:
#	docs/CHANGELOG.txt
2025-07-05 19:25:45 +02:00
ocornut
92e2df5978 Merge branch 'master' into docking 2025-06-30 21:18:46 +02:00
ocornut
fd75bdccb0 Fonts: for large size fonts, layout/size calculation only load glyphs metrics. Actual glyphs are renderer+packed when used by drawing functions. (#8758, #8465)
(Breaking) breaks signature of ImFontLoader::FontBakedLoadGlyph, sorry.
2025-06-30 21:16:20 +02:00
ocornut
b7e5d76c79 Fonts: added ImFontAtlas::SetFontLoader() to dynamically change font loader at runtime without using internal API. (#8752, #8465) 2025-06-30 20:01:02 +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