ocornut
ebcfcd8da3
Merge branch 'master' into docking
2024-01-09 22:39:06 +01:00
Pascal Thomet
4758f74676
imgui_freetype: fix nullptr to ImTextureID cast ( #7192 )
2024-01-03 22:54:36 +01:00
ocornut
8add6bcb9f
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2023-12-14 17:21:15 +01:00
ocornut
aaf157cfdd
Commented out ImGuiFreeType::BuildFontAtlas() obsoleted in 1.81. Commented out legacy ImGuiColumnsFlags_XXX symbols redirecting to ImGuiOldColumnsFlags_XXX, obsoleted in 1.80.
...
Amend 9499afdf72de6f336
2023-12-05 17:04:19 +01:00
ocornut
ce0d0ac829
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
2023-11-15 16:08:53 +01:00
ocornut
46843b683b
Fonts: minor/shallow amends ( #6925 )
2023-11-13 19:00:29 +01:00
thedmd
ade4d0e08a
Fonts: added support for RasterizerDensity to FreeType based atlas generator. ( #6925 )
2023-11-13 19:00:28 +01:00
ocornut
72ebd91567
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.h
2023-10-05 15:10:45 +02:00
DKing
701a047ac0
Fonts: Fix clang compiling warning & error with freetype + lunasvg ( #6873 , #6842 , #6591 )
...
Amend d6360c1
2023-09-28 19:33:27 +02:00
ocornut
3ce6b06feb
Merge branch 'master' into docking
2023-09-20 12:53:35 +02:00
ocornut
d6360c1ba9
Fonts, imgui_freetype: Fixed a warning and leak in IMGUI_ENABLE_FREETYPE_LUNASVG support. ( #6842 , #6591 )
2023-09-20 11:31:28 +02:00
ocornut
30594c37d0
Merge branch 'master' into docking
2023-08-01 10:22:21 +02:00
ocornut
ab490dc7b8
Fonts: Amends for support for OpenType SVG fonts using lunasvg ( #6591 , #6607 )
2023-08-01 10:18:30 +02:00
sakiodre
2ad8c60abc
Fonts: Added support for OpenType SVG fonts using lunasvg ( #6591 , #6607 )
2023-08-01 09:32:17 +02:00
Johel Ernesto Guerrero Peña
556ce9f543
imgui_stdlib: Fix warning ( #6658 )
2023-07-28 14:15:10 +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
677c7b2258
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# docs/CHANGELOG.txt
# docs/TODO.txt
2023-07-04 14:58:03 +02:00
sakiodre
dcdb145713
Docs: Fix outdated link in freetype docs ( #6568 )
2023-07-04 12:23:13 +02:00
ocornut
aec062a8a5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# examples/example_win32_directx9/main.cpp
# imgui_internal.h
2023-04-11 16:16:17 +02:00
Michael Martz
506f7e0074
Using nullptr in locations where warning disable is not convenient. ( #6313 , #4537 )
2023-04-11 11:33:50 +02:00
ocornut
4fdafef54f
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# docs/CHANGELOG.txt
# imgui_widgets.cpp
2023-03-29 18:41:41 +02:00
ocornut
f65bcf481a
Docs: added details and link to wiki from imgui_stdlib to increase discoverability.
2023-03-23 19:03:17 +01:00
ocornut
6b3435a2db
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
2023-03-16 12:01:13 +01:00
ocornut
301c956039
Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. ( #3038 )
2023-03-15 17:09:09 +01:00
ocornut
4078abe14c
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui.h
2023-03-06 17:03:55 +01:00
ocornut
752603bc70
Fixed imgui_single_file.h for IMGUI_DEFINE_MATH_OPERATORS change. ( #6164 , #6137 , #5966 , #2832 )
...
Amend a1b8457
2023-02-15 19:50:03 +01:00
ocornut
e25e4526cd
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
2023-02-15 18:18:47 +01:00
ocornut
4f630b0449
imgui_freetype: fixed non-ASCII characters in sources. ( #6166 )
2023-02-15 16:43:08 +01:00
ocornut
192196711a
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2023-02-14 16:01:11 +01:00
ocornut
092b6825ac
Fonts: Assert that in each GlyphRanges[] pairs first is <= second.
2023-02-14 15:00:12 +01:00
ocornut
887abe9578
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
2023-02-01 22:18:57 +01:00
ocornut
e8421de23c
imgui_single_file: include imgui_freetype.cpp if the define is set.
...
.h not often needed but doesn't cost much to include.
2023-01-24 16:04:55 +01:00
ocornut
8f907bc9a2
imgui_freetype: fix warnings ( #6104 ), fix typos. ( #6079 )
2023-01-24 15:59:14 +01:00
ocornut
d822c65317
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
2023-01-05 15:58:49 +01:00
ocornut
9150c23c04
imgui_freetype: fixed a packing issue which in some occurrences would prevent large amount of glyphs from being packed correctly. ( #5788 , #5829 )
...
This seemingly innocuous change sursingly had very large side-effects of completly breaking packing for the test font mentioned in above issue. Not even sure why tbh. New code matches what stb_truetype's stbtt_PackBegin() does.
2023-01-04 15:22:56 +01:00
ocornut
edf522b58a
Merge branch 'master' into docking + amends change to nullptr ( #5760 )
...
# 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_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui_internal.h
2022-10-11 15:59:23 +02:00
cfillion
5884219867
imgui_freetype: Assert if bitmap size exceed chunk size to avoid buffer overflow. ( #5731 )
2022-09-30 16:12:51 +02:00
ocornut
e900ca355e
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui.h
2022-06-10 19:29:17 +02:00
Rokas Kupstys
74f7ac04a1
Misc: Fix font compressor utility warnings. ( #5359 )
2022-05-31 14:25:40 +02:00
ocornut
6b5a2426d7
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_metal.mm
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
2022-05-17 11:59:32 +02:00
BttrDrgn
4db55f88e8
Changed FONT.md edit to blob ( #5290 )
...
Stop from opening the editor for freetype/README.md
2022-05-06 09:47:18 +02:00
ocornut
377b864bb4
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# imgui_internal.h
# imgui_widgets.cpp
2022-03-23 17:21:34 +01:00
ocornut
fd06ed833b
Misc: tweaks + fix warnings on backends withtout -wno-memaccess ( #4995 , #5104 )
2022-03-13 17:57:32 +07:00
ocornut
9948535118
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2022-02-17 18:47:43 +01:00
Konstantin Podsvirov
7ff41a78f9
Fonts: binary_to_compressed_c.cpp gained -nostatic option ( #5021 )
...
This allow to use added variables in other source files via extern declaration.
2022-02-16 17:02:33 +01:00
ocornut
d378e4088f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2022-02-01 15:46:42 +01:00
Clownacy
422902dbda
Correct typos ( #4954 , #4955 ), use IM_STATIC_ASSERT now that old pre-C++11 macro has been obsoleted.
2022-01-31 11:58:33 +01:00
ocornut
dc8c3618e8
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
2021-11-10 15:26:03 +01:00
ocornut
ebac375791
Docs: added info about Freetype, editing sponsors.
2021-11-08 16:22:00 +01:00
