Commit graph

3113 commits

Author SHA1 Message Date
ocornut
11b3a7c8ca Merge branch 'master' into docking 2025-01-31 16:10:20 +01:00
ocornut
dbb5eeaadf Version 1.91.8 2025-01-31 16:08:17 +01:00
ocornut
c2dcc80660 Docking: fixed ImGuiWindowFlags_DockNodeHost/ImGuiWindowFlags_NavFlattened clash introduced by c38c18c1a just for 1.91.7 (#8357) 2025-01-30 11:39:52 +01:00
ocornut
082595200d Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2025-01-29 20:04:45 +01:00
ocornut
dabc990189 Rename internal id for standardizing naming convention. "##menubar" -> "##MenuBar", "###NavWindowingList" -> "###NavWindowingOverlay"
"###NavUpdateWindowing" one should have zero side effect on anyone.
2025-01-29 19:59:41 +01:00
ocornut
355cb589e3 Merge branch 'master' into docking, incl conflict merge in BeginMenuBar() for #8267
# Conflicts:
#	imgui_widgets.cpp
2025-01-24 19:40:54 +01:00
ocornut
8a1613a382 Fonts: OversampleH/OversampleV value defaults to 0 for automatic selection. 2025-01-24 19:32:30 +01:00
ocornut
4211fdc70b ImFont: compact comments in header section. 2025-01-24 17:49:34 +01:00
ocornut
9eafb7bbfb ImFont: IndexLookup[] table hold 16-bit values even in ImWchar32 mode. 2025-01-24 16:54:59 +01:00
ocornut
10199341b1 ImFontAtlas: made calling ClearFonts() call ClearInputData(). (#8174, #6556, #6336, #4723) 2025-01-23 11:31:32 +01:00
ocornut
64e738cae7 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2025-01-22 12:19:09 +01:00
ocornut
6906ac979e ColorEdit, ColorPicker: (Breaking) redesigned how alpha is displayed in the preview square. (#8335, #1578, #346)
Added ImGuiColorEditFlags_AlphaOpaque, ImGuiColorEditFlags_AlphaNoBg.
Removed ImGuiColorEditFlags_AlphaPreview.
2025-01-22 12:12:07 +01:00
ocornut
fdca6c08ad Inputs: added IsMouseReleasedWithDelay() helper. (#8337, #8320) 2025-01-22 11:28:47 +01:00
ocornut
bf13442c7c Moved ImGuiColorEditFlags_AlphaPreview/ImGuiColorEditFlags_AlphaPreviewHalf flags. Demo: reorganized some of color edit/picker demo section. 2025-01-21 14:59:29 +01:00
ocornut
6e94f6cefb Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui_internal.h
2025-01-20 18:04:31 +01:00
ocornut
80c9cd1f6e Font: reduce unnecessary padding in ImFontConfig struct too. 2025-01-18 16:45:58 +01:00
ocornut
d7454de80a Font: minor tweak to struct alignment. 2025-01-17 18:09:28 +01:00
ocornut
487d7f9a29 Font: Internals: make used page maps smaller. Since it's extremely rarely used and for iterations only. ~34->16 bytes with ImWchar32. 2025-01-16 22:30:43 +01:00
ocornut
b7c27c5333 Windows: legacy SetWindowFontScale() is properly inherited by nested child windows. (#2701, #8138, #1018) 2025-01-16 19:08:39 +01:00
ocornut
015186aaf8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_vulkan.cpp
2025-01-15 17:34:17 +01:00
ocornut
0e21bde77b Misc shallow merge to reduce diff in other branches. 2025-01-15 14:00:03 +01:00
ocornut
8a9de84cd0 FontAtlas: reduced baked IM_DRAWLIST_TEX_LINES_WIDTH_MAX from 63 to 32. (#3245) 2025-01-15 14:00:03 +01:00
ocornut
c59a2267d0 Version 1.91.8 WIP 2025-01-15 11:58:47 +01:00
ocornut
c0ae3258f9 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2025-01-14 13:46:39 +01:00
ocornut
5c1d2d1e4c Version 1.91.7 2025-01-14 13:29:25 +01:00
ocornut
9f8481a842 (Breaking) TreeNode: renamed ImGuiTreeNodeFlags_SpanTextWidth to ImGuiTreeNodeFlags_SpanLabelWidth. (#6937) 2025-01-14 13:14:50 +01:00
ocornut
c38c18c1a0 Avoid using 1<<31 for ImGuiWindowFlags_NavFlattened as it seems to confuse some binding generators. 2025-01-13 19:39:57 +01:00
ocornut
290e402a02 TreeNode, Tables: added ImGuiTreeNodeFlags_LabelSpanAllColumns. (#8318, #3565) 2025-01-13 18:55:09 +01:00
ocornut
00f12b9a09 InputText: Fixed not calling CallbackEdit on revert/clear with Escape key. (#8273) + rework comments.
Seems like there is no reason to not run that path. Amend ancient 9501cd99, f3ab5e625
2025-01-13 15:25:20 +01:00
ocornut
d0d571e0d7 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui_internal.h
2025-01-13 14:30:57 +01:00
ocornut
a604d4f717 Fixed IsItemDeactivated(), IsItemDeactivatedAfterEdit() to work when interrupted before/after the active id is submitted. (#5184, #5904, #6766, #8303, #8004) 2025-01-13 14:09:41 +01:00
ocornut
9cc0bf89bd Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
2025-01-06 17:59:22 +01:00
ocornut
80aafbc81b Data types: moved ImGuiDataType_String to public API as a convenience enum value only. (#8266) 2025-01-06 14:22:03 +01:00
ocornut
a0f907933d Happy new year! 2025-01-06 14:07:06 +01:00
Admiral H. Curtiss
87f3109c1a
Fix capitalization of ImGuiID in comment. (#8283) 2025-01-03 21:07:42 +01:00
ocornut
5413a9a6b4 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui_internal.h
2024-12-20 23:31:52 +01:00
ocornut
fd93229770 Tables, MultiSelect: Fixed an issue where column width may be mismeasured when calling BeginMultiSelect() while inside a table. (#8250) 2024-12-19 18:14:22 +01:00
Raffaello Bertini
cd6c83cdcc Fixes GCC warnings (#8241) 2024-12-18 17:58:19 +01:00
ocornut
edef72d497 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
2024-12-18 17:02:08 +01:00
ocornut
e900571ac2 InputText: Fixed issue when activating a ReadOnly field when the underlying value is being modified. (#8242) 2024-12-18 16:17:14 +01:00
ocornut
4ad5496474 Drags: Added ImGuiSliderFlags_NoSpeedTweaks flag to disable keyboard modifiers altering the tweak speed. (#8223) 2024-12-12 18:39:28 +01:00
ocornut
4cc464eadc BeginListBox(): Comments (#8220) 2024-12-12 16:44:20 +01:00
ocornut
1d069cf435 Fonts: store 0 for unset EllipsisChar/FallbackChar. Pull config in BuildLookupTable(). 2024-12-11 16:43:29 +01:00
ocornut
f25665f360 Version 1.91.7 WIP 2024-12-11 15:37:16 +01:00
ocornut
947aa9c972 Merge branch 'master' into docking 2024-12-11 15:08:31 +01:00
ocornut
993fa34749 Version 1.91.6 2024-12-11 15:05:36 +01:00
ocornut
a9cd0f5e42 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_allegro5.cpp
#	backends/imgui_impl_allegro5.h
#	backends/imgui_impl_android.cpp
#	backends/imgui_impl_android.h
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	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_sdl2.h
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdl3.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	backends/imgui_impl_win32.h
#	imgui.cpp
2024-12-11 12:27:25 +01:00
ocornut
c3ffd4c53e Misc: Added IMGUI_USE_LEGACY_CRC32_ADLER to use old tables. (#8169, #4933) 2024-12-11 12:13:28 +01:00
ocornut
d78e823449 InputText: added ImGuiInputTextFlags_ElideLeft. (#1442, #1440, #4391, #7208, #8216) 2024-12-09 15:00:04 +01:00
ocornut
ff2d6815ef Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_dx9.h
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp
2024-12-04 19:56:35 +01:00