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
3 years ago
fd06ed833b
Misc: tweaks + fix warnings on backends withtout -wno-memaccess ( #4995 , #5104 )
3 years ago
9948535118
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
3 years ago
7ff41a78f9
Fonts: binary_to_compressed_c.cpp gained -nostatic option ( #5021 )
...
This allow to use added variables in other source files via extern declaration.
3 years ago
d378e4088f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
3 years ago
422902dbda
Correct typos ( #4954 , #4955 ), use IM_STATIC_ASSERT now that old pre-C++11 macro has been obsoleted.
3 years ago
dc8c3618e8
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
3 years ago
ebac375791
Docs: added info about Freetype, editing sponsors.
3 years ago
dedb381c51
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
3 years ago
68f428b449
imgui_freetype: Fixed crash when FT_Render_Glyph() returns NULL (which apparently happens with Freetype 2.11). ( #4394 , #4145 ?)
3 years ago
a11f36811f
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_opengl3.cpp
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
3 years ago
327a5d8253
Fix warning + apply trailing whitespaces in stb_ libs (as applied on nothings/stb on 2020/02/02, facilitating further diffs)
3 years ago
ac35b4bba2
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
3 years ago
e534c56485
Fonts: Functions with a 'float size_pixels' parameter can accept zero if it is set in ImFontSize::SizePixels.
3 years ago
20d415e939
FIx static analysers warnings and disable false positives.
3 years ago
4161a67b38
ImVector: added clear_delete(), clear_destruct() helpers.
...
# Conflicts:
# imgui.cpp
3 years ago
d0c6dd9baf
ImVector: added clear_delete(), clear_destruct() helpers.
3 years ago
a44d4da87c
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
3 years ago
020d1ced1d
Examples: SDL2: Accomodate for vcpkg install having headers in SDL2/SDL.h vs SDL.h + vcpkg related comments.
3 years ago
1b435ae3e0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
3 years ago
c708299ca9
Docs: Improvements to description of using colored glyphes/emojis. ( #4169 , #3369 ) + Add Fonts to Metrics. Removed IMGUI_HAS_TABLE markers.
3 years ago
81e0b18e38
Merge branch 'master' into docking
4 years ago
ebe6ac5fb5
Improvements to minor mistakes in documentation comments ( #3923 )
4 years ago
256594575d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
1bc6f82091
Misc: added imgui.gdb and imgui.natstepfilter debugger helpers for gdb and msvc.
4 years ago
f1bf642e8f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# misc/debuggers/imgui.natvis
4 years ago
fdc2324d9a
Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'
4 years ago
80533ea5e1
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
4 years ago
f5bc5e8630
Freetype: Enable FreeType bitmap glyphs. ( #3879 )
4 years ago
6aee4bcdc5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
23ab4978e4
ImFontAtlas: Added 'bool TexPixelsUseColors' output to help backend decide of underlying texture format. ( #3369 , #3844 )
4 years ago
239d09804d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
4 years ago
4df57136e9
Version 1.81
4 years ago
7a516a266d
Merge remote-tracking branch 'origin/master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
4 years ago
24be26e00e
imgui_freetype: Add support for colored glyphs. Font: add support for untinted glyphs ( #3369 )
...
Amend 9499afd
4 years ago
24aa6654df
imgui_freetype: add support for colored glyphs with ImGuiFreeTypeBuilderFlags_LoadColor ( #3369 )
...
(squashed 4 commits)
4 years ago
577e7cb493
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
9499afdf5e
imgui_freetype: clarify breaking changes, and add BuildFontAtlas() to be consistent with planned obsolescence. Rename mislabelled internal helper. Demo: clarify labels in nested table demo. ( #3765 )
4 years ago
3867c6c5f0
Fonts: (Breaking) Rename ImGuiFreeType:: flags to ImGuiFreeTypeBuilderFlags_XXX. Remove ImGuiFreeType::BuildFontAtlas() flags. Rename ImFontConfig::RasterizerFlags to FontBuilderFlags. Add ImFontBuilderIO (opaque). Amend 53d59f3 with a dozen of small fixes.
4 years ago
dd4ca70b0d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_demo.cpp
4 years ago
182115409a
Internals: added ImSpan helper structure + 2020/10/01 stricter bound checking
4 years ago
9c8671e7b0
Tables: Add empty file, skeleton.
4 years ago
455c21df71
Merge branch 'master' into docking + dockspace demo comments
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# docs/CHANGELOG.txt
# imgui_internal.h
# imgui_widgets.cpp
4 years ago
31a144b60c
Fix comments ( #3534 )
4 years ago
682249396f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
6469b94304
Silence memset warning. ( #3505 )
...
Compiling the code as-is results in the following warning:
-->8--
imgui_freetype.cpp:341:72: warning: ‘void* memset(void*, int, size_t)’
clearing an object of type ‘struct ImFontBuildSrcDataFT’ with no
trivial copy-assignment; use assignment or value-initialization
instead [-Wclass-memaccess]
341 | memset(src_tmp_array.Data, 0, (size_t)src_tmp_array.size_in_bytes());
| ^
imgui_freetype.cpp:302:8: note: ‘struct ImFontBuildSrcDataFT’ declared here
302 | struct ImFontBuildSrcDataFT
| ^~~~~~~~~~~~~~~~~~~~
--8<--
This is caused by presence of ImVector<> directly in ImFontBuildSrcDataFT data
structure, as well as in the child ImBitVector. Since ImVector<> has a
constructor, the compiler infers that initialization by memset is not valid.
Such initialization is not a bug, however, as the default ImVector<> ctor just
sets the structure data members to 0, which is exactly what the memset does.
Casting the data structure address to void* pointer silences this warning.
4 years ago
2c13a74a9d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
4 years ago
90b152f265
ImFontAtlas: Fixed multiple rebuild with same inputs erroneously increased ConfigDataCount. CI: Update Ubuntu 18.04 > 20.04 (motivated by #3369 )
...
Fix Freetype warning.
4 years ago
de1588928b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
4 years ago
5d87941451
Fixed ImFontConfig::GlyphExtraSpacing and ImFontConfig::PixelSnapH settings being pulled from the merged/target font settings when merging fonts, instead of being pulled from the source font settings.
4 years ago
ocornut
Konstantin Podsvirov
Clownacy
ANF-Studios
Rokas Kupstys
TAiGA
Petr Shurgalin
Bartosz Taudul