mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-02 21:19:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
9,775 Commits 9 Branches 125 Tags 234 MiB
f63c95a076
Commit Graph

1677 Commits

Author SHA1 Message Date
ocornut
f63c95a076 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 2024-09-04 16:58:44 +02:00
ocornut
1dfbb100d6 Version 1.91.1 2024-09-04 16:53:43 +02:00
ocornut
722a2a12fb Tables: comments. (#7937) 2024-09-04 14:42:00 +02:00
ocornut
afb15e9795 PlotHistogram, PlotLines: register item ID in a more idiomatic manner. (#7935, #3072) 2024-09-03 21:49:35 +02:00
Yan Pujante
07be01767a Demo: added emscripten version. (#7915) 2024-09-03 19:26:29 +02:00
ocornut
4fc187dc60 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2024-08-23 19:19:22 +02:00
ocornut
0b9adc2c79 BeginChild: (BREAKING) renamed ImGuiChildFlags_Border to ImGuiChildFlags_Borders. 
Amend 7713c2925 + renamed similar argument in other functions.
 2024-08-23 15:28:42 +02:00
ocornut
fed4841bd4 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 2024-08-22 20:26:59 +02:00
ocornut
bf75504d7a Style: added PushStyleVarX(), PushStyleVarY() helpers to modify only one component of a ImVec2 var. 
+ tweak existing function to early out on error.
 2024-08-22 13:55:42 +02:00
ocornut
24b077c7f8 Merge branch 'master' into docking (multi-viewport broken until next commit) 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2024-08-19 14:44:35 +02:00
ocornut
3232070d3a Demo: Fixed truncation warning. (#7857) 2024-08-07 12:48:13 +02:00
ocornut
d8c98c8c14 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
 2024-08-01 19:07:53 +02:00
ocornut
dcf54782d4 Version 1.91.WIP 2024-07-31 16:34:28 +02:00
ocornut
139e99ca37 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 2024-07-30 16:57:42 +02:00
ocornut
8199457a7d Version 1.91.0 2024-07-30 16:56:31 +02:00
ocornut
1b44e40444 Demo: re-use tree data. Fix property editor vertical alignment. Tweak recent memory allocation monitor. 2024-07-30 11:58:30 +02:00
ocornut
6df1a06fc3 Merge branch 'master' into docking 2024-07-29 23:18:54 +02:00
ocornut
ce3a8d7c79 Demo: MultiSelect: added tree demo. (#6990, #3823, #1861) 2024-07-29 22:46:56 +02:00
ocornut
b847c41437 MultiSelect: BoxSelect: fixed using in frozen table. (#7821, #5143) + added Demo. 
Amend 0b4a1a40
 2024-07-29 15:35:57 +02:00
Rémi Hérilier
c7b9256097 Selectable: added ImGuiSelectableFlags_Highlight flag to highlight items independently from the hovered state. (#7820) 
Demo: Make the Widget/List boxes show how to use forced highlighting.
 2024-07-29 12:05:08 +02:00
ocornut
3552df562e Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2024-07-25 16:41:56 +02:00
ocornut
aad86b8756 Obsoleted GetWindowContentRegionMin() and GetWindowContentRegionMax(). 
You should never need those functions. You can do everything with GetCursorScreenPos() and GetContentRegionAvail().
 2024-07-25 15:53:55 +02:00
ocornut
3fab2bb7be Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
 2024-07-22 19:41:39 +02:00
ocornut
605c8d7110 Demo: Property Editor: using ImGuiChildFlags_NavFlattened now that a bug is fixed. Fixed static analyzer. 2024-07-22 15:05:15 +02:00
ocornut
c3dca77a19 Demo: rework Property Editor. 2024-07-22 14:49:16 +02:00
Thomas Stehle
da36336321 TabBar, Style: added style option for the size of the Tab-Bar Overline (#7804) 
Amend 21bda2e.
 2024-07-22 10:58:16 +02:00
ocornut
02cc7d451c Merge branch 'master' into docking 
# Conflicts:
#	imgui_demo.cpp
 2024-07-19 18:49:25 +02:00
ocornut
168ef39984 Demo: moved menu bar code to its own function. 2024-07-19 15:46:51 +02:00
ocornut
57eea6746e Demo: moved some fields inside a struct. 2024-07-19 15:40:50 +02:00
ocornut
2546d0a0db Demo: moved ExampleTreeNode, ExampleMemberInfo above in the demo file. Tidying up index. 
+ change ExampleTreeNode::UID from ImGuiID to int to not suggest that the user ID needs to be of a certain type
 2024-07-19 14:52:24 +02:00
ocornut
fd77815f9f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 2024-07-18 18:22:26 +02:00
ocornut
2688562fd2 MultiSelect: Better document how TreeNode() is not trivially usable yet. 
Will revert when the time is right.
 2024-07-18 18:19:22 +02:00
ocornut
7d4de84ee3 MultiSelect: added courtesy ImGuiMultiSelectFlags_NavWrapX flag so we can demo this until a nav api is designed. 2024-07-18 18:19:22 +02:00
ocornut
3f34c83bc6 MultiSelect: added ImGuiMultiSelectFlags_NoAutoClearOnReselect + tweak flags comments. (#7424) 2024-07-18 18:19:21 +02:00
ocornut
a8a1f29512 MultiSelect: (breaking) renamed ImGuiMultiSelectFlags_BoxSelect -> ImGuiMultiSelectFlags_BoxSelect2d. Which include not assuming one flag imply the other. 
Amend 2024/05/31 commit.
 2024-07-18 18:19:21 +02:00
ocornut
3ac367ff41 MultiSelect: ImGuiSelectionBasicStorage: (breaking) rework GetNextSelectedItem() api to avoid ambiguity/failure when user uses a zero id. 2024-07-18 18:19:21 +02:00
ocornut
f472f17054 Demo: Assets Browser: added a way to disable sorting and hide sorting options. 
This is mostly designed to showcase that on very large sets (e.g. 1 million) most of the time is likely spent on sorting.
 2024-07-18 18:19:21 +02:00
ocornut
e1fd25051e MultiSelect: ImGuiSelectionBasicStorage: added GetNextSelectedItem() to abstract selection storage from user. Amend Assets Browser demo to handle drag and drop correctly. 2024-07-18 18:19:21 +02:00
ocornut
db4898cb91 MultiSelect: added ImGuiSelectionExternalStorage helper. Simplify bool demo. 2024-07-18 18:19:20 +02:00
ocornut
c94cf6f01f MultiSelect: added ImGuiSelectionBasicStorage::GetStorageIdFromIndex() indirection to be easier on the reader. 
Tempting to make it a virtual.
 2024-07-18 18:19:20 +02:00
ocornut
ab995d3d4f MultiSelect: (breaking) Added 'items_count' parameter to BeginMultiSelect(). Will enable extra features, and remove equivalent param from ImGuiSelectionBasicStorage::ApplyRequests(. 2024-07-18 18:19:20 +02:00
ocornut
443b034895 MultiSelect: mark parent child window as navigable into, with highlight. Assume user will always submit interactive items. 2024-07-18 18:19:20 +02:00
ocornut
f6b5caf82c MultiSelect: (breaking) renamed ImGuiMultiSelectFlags_BoxSelect -> ImGuiMultiSelectFlags_BoxSelect1d, ImGuiMultiSelectFlags_BoxSelect2d -> ImGuiMultiSelectFlags_BoxSelect. 
ImGuiMultiSelectFlags_BoxSelect1d being an optimization it is the optional flag.
 2024-07-18 18:19:20 +02:00
ocornut
7bbbbea200 MultiSelect: Box-Select: fixes for checkboxes support. Comments. 2024-07-18 18:19:20 +02:00
ocornut
2f56df4839 MultiSelect: (breaking) renamed ImGuiSelectionBasicStorage::AdapterData to UserData. 2024-07-18 18:19:20 +02:00
ocornut
9435a3185a RangeSelect/MultiSelect: (Breaking) Added current_selection_size to BeginMultiSelect(). 
Required for shortcut routing so we can e.g. have Escape be used to clear selection THEN to exit child window.
 2024-07-18 18:19:19 +02:00
ocornut
955210ae5b MultiSelect: Demo: use Shortcut(). 
Got rid of suggestion to move Delete signal processing to BeginMultiSelect(), seems unnecessary.
 2024-07-18 18:19:19 +02:00
ocornut
e7a734f78d MultiSelect: added ImGuiMultiSelectFlags_NoAutoSelect, ImGuiMultiSelectFlags_NoAutoClear features + added Checkbox Demo 
Refer to "widgets_multiselect_checkboxes" in imgui_test_suite.
 2024-07-18 18:19:19 +02:00
ocornut
a639346fba MultiSelect: Demo: make various child windows resizable, with synched heights for the dual list box demo. 2024-07-18 18:19:19 +02:00
ocornut
dbc67bbf23 MultiSelect: Simplified ImGuiSelectionBasicStorage by using a single SetItemSelected() entry point. 2024-07-18 18:19:19 +02:00