ocornut
8947c35fa1
MultiSelect: Removed SelectableSpacing as I'm not sure it is of use for now (history insert)
2024-07-18 18:19:11 +02:00
omar
554db6bc0f
MultiSelect: WIP range-select ( #1861 ) (rebased six millions times)
2024-07-18 18:19:11 +02:00
ocornut
0e485a2109
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_widgets.cpp
2024-07-18 17:56:27 +02:00
ocornut
74a1854db9
Nav, Demo: comments.
2024-07-17 17:03:22 +02:00
ocornut
67e9aa4d3d
Demo: Property Editor: add basic filter.
2024-07-17 14:01:02 +02:00
ocornut
4247f190c2
Demo: Property Editor: rearrange code + replace use of bool to proper ImGuiChildFlags.
...
Amend 46691d1
2024-07-17 13:52:30 +02:00
ocornut
0e4dcfa552
Obsoleted PushTabStop()/PopTabStop() in favor of using new PushItemFlag()/PopItemFlag() with ImGuiItemFlags_NoTabStop.
2024-07-15 18:57:46 +02:00
ocornut
b4ca869c40
(Breaking) Obsoleted PushButtonRepeat()/PopButtonRepeat() in favor of using new PushItemFlag()/PopItemFlag() with ImGuiItemFlags_ButtonRepeat.
2024-07-15 18:38:18 +02:00
ocornut
7e0800e718
Added PushItemFlag(), PopItemFlag(), ImGuiItemFlags.
2024-07-15 18:38:18 +02:00
ocornut
46691d172e
Demo: Reworked "Property Editor" demo in a manner that more ressemble the tree data and struct description data that a real application would want to use.
2024-07-15 17:14:01 +02:00
ocornut
5ea96c15cd
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_win32.cpp
2024-07-15 11:21:18 +02:00
Hugues Evrard
6b6026b133
DemosFix typo in help text in demo Tables/Borders ( #7780 )
...
The help text for flags had a "V" flag duplicated, this change corrects it to the missing "H" flag.
2024-07-08 11:43:09 +02:00
ocornut
2d0baaabe6
TreeNode: rename/rework ImGuiNavTreeNodeData system to be usable by more features. ( #2920 , #1131 , #7553 )
...
Reworked to it is easier during TreeNode code to request extra data to be stored.
2024-07-03 18:59:26 +02:00
ocornut
0a73c6ec3f
Misc tweaks, comments.
2024-07-03 18:02:59 +02:00
ocornut
3f61da7e8b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
# imgui.h
# imgui_internal.h
2024-07-02 17:48:38 +02:00
ocornut
5496050f5f
Added TextLink(), TextLinkOpenURL() hyperlink widgets. ( #7660 )
2024-07-02 17:21:44 +02:00
ocornut
0250dc903e
Demo: changed style editor inline block to its own window.
2024-07-02 14:38:44 +02:00
ocornut
84cc72f372
Version 1.91.0 WIP
2024-07-01 19:02:42 +02:00
ocornut
3369cbd277
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
2024-07-01 17:10:12 +02:00
ocornut
cb16be3a3f
Version 1.90.9
2024-07-01 17:03:21 +02:00
ocornut
dd5c30d2d7
Disabled: Reworked 1.90.8 behavior of Begin() not inheriting current BeginDisabled() state. Only tooltip are clearing that state. ( #211 , #7640 )
2024-07-01 14:32:11 +02:00
Kevin Coghlan
372eebbeb2
Fix typo, rename ImGuisliderFlags_WrapAround flag to ImGuiSliderFlags_WrapAround. ( #7752 , #7749 )
2024-06-28 18:06:16 +02:00
ocornut
138d9d0c21
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl2.cpp
# backends/imgui_impl_opengl3.cpp
2024-06-28 16:03:49 +02:00
ocornut
0403096a9d
Drags: added ImGuisliderFlags_WrapAround flag for DragInt(), DragFloat() etc. ( #7749 )
2024-06-28 15:59:36 +02:00
ocornut
10a5a857f5
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
# backends/imgui_impl_win32.cpp
# imgui.h
2024-06-26 14:54:01 +02:00
ocornut
aab27130a6
Demo: Style Editor: clarify how _CalcCircleAutoSegmentCount() doesn't always get exact final segment count. ( #7731 )
2024-06-24 12:58:11 -07:00
ocornut
7237d3e5c3
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
2024-06-21 16:18:22 -07:00
cfillion
755bf2b8c2
(Breaking) Move ImGuiWindowFlags_NavFlattened to ImGuiChildFlags_NavFlattened. ( #7687 )
2024-06-21 16:00:57 -07:00
ocornut
e3971079cf
IO: added ImGuiConfigFlags_NoKeyboard for consistency and convenience. ( #4921 )
...
# Conflicts:
# imgui.h
# imgui_demo.cpp
2024-06-21 10:17:44 -07:00
ocornut
3e7f1d42db
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2024-06-18 17:45:17 -07:00
ocornut
21bda2ed99
TabBar, Style: added ImGuiTabBarFlags_DrawSelectedOverline and ImGuiCol_TabSelectedOverline, ImGuiCol_TabDimmedSelectedOverline.
2024-06-18 17:41:43 -07:00
ocornut
7260bb51cf
Version 1.90.9 WIP
2024-06-07 16:57:01 +02:00
ocornut
6d948ab47e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-06-06 17:52:55 +02:00
ocornut
6f7b5d0ee2
Version 1.90.8
2024-06-06 17:45:40 +02:00
ocornut
47db0698d2
InputScalar, InputInt, InputFloat: added ImGuiInputTextFlags_ParseEmptyRefVal, ImGuiInputTextFlags_DisplayEmptyRefVal. ( #7305 )
2024-06-06 16:51:15 +02:00
ocornut
0561d708ba
Modals, Popups: fixed an issue preventing to close a popup opened over a modal by clicking over void. ( #7654 )
2024-06-05 15:55:01 +02:00
ocornut
fdc084f532
Merge branch 'master' into docking
2024-06-03 19:08:37 +02:00
Rodrigo Rivas Costa
e47015aef4
Demo: remove incompatible ImGuiInputFlags for Shortcut(). ( #7637 )
2024-05-31 16:30:11 +02:00
ocornut
51823d117d
Misc: made ImGuiDir, ImGuiSortDirection, ImGuiMouseCursor stronger-typed enums + cater for possible warning in backends's switch()
...
Not making ImGuiMouseCursor one because of warnings for non-explicitly handled value (case default: is not enough).
2024-05-28 18:09:41 +02:00
ocornut
222dd775fc
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2024-05-28 17:11:57 +02:00
ocornut
479c5f62fc
Style: make DisplayWindowPadding visible in style editor.
2024-05-28 15:47:19 +02:00
ocornut
1f9fc382c3
Version 1.90.8 WIP
...
Tidying up todo.txt
2024-05-28 10:09:31 +02:00
ocornut
2db79d0868
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-05-27 15:47:30 +02:00
ocornut
00ad3c65bc
Version 1.90.7
2024-05-27 15:47:04 +02:00
ocornut
fee0210592
Merge branch 'master' into docking
2024-05-24 16:09:29 +02:00
ocornut
ce4e210dcb
Shotcuts: renamed ImGuiInputFlags_RouteGlobalOverFocused -> ImGuiInputFlags_RouteOverFocused, ImGuiInputFlags_RouteGlobalOverActive -> ImGuiInputFlags_RouteOverActive in previsiion of using them with a Hovered route. ( #456 )
2024-05-24 16:07:58 +02:00
ocornut
5ce3d29955
Shortcuts: rename ImGuiInputFlags_RouteGlobalHighest to ImGuiInputFlags_RouteGlobalOverActive, made ImGuiInputFlags_RouteGlobalOverFocused and ImGuiInputFlags_RouteGlobalOverActive flags. ( #456 )
2024-05-24 15:44:59 +02:00
ocornut
650cb51bf1
Shortcuts: renamed ImGuiInputFlags_RouteActiveItem to ImGuiInputFlags_RouteActive. ( #456 , #7618 )
...
Amend ef9d525
2024-05-24 15:27:48 +02:00
ocornut
ef9d525f02
Shortcuts: added ImGuiInputFlags_RouteActiveItem. ( #456 , #7618 ) + rearrange Changelog
2024-05-24 15:07:43 +02:00
ocornut
374b9a7fb4
Demo: Documents: refactor + add Renaming option. ( #7233 )
2024-05-23 21:35:07 +02:00
ocornut
1002cfa6d2
Demo, Shortcut(): amend Shortcuts demo. ( #456 )
2024-05-23 18:12:42 +02:00
ocornut
5ecef2f321
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
2024-05-23 17:25:02 +02:00
ocornut
c06e6340cd
Shortcuts: added ImGuiInputFlags_Tooltip. ( #456 )
2024-05-23 16:58:14 +02:00
ocornut
197f8904fe
Shortcuts, Nav: make SetNextItemShortcut() work when another item is active. Made NavCalcPreferredRefPos() take account for remote activation. ( #456 )
...
Unsure why filter in ItemHandleShortcut(), will probably find out soon enough.
2024-05-23 16:57:19 +02:00
ocornut
dc5caa483c
Demo: added "Shortcuts" section. ( #456 , #2637 )
2024-05-23 16:57:19 +02:00
ocornut
9ebab255d2
Docking: *BREAKING* changed signature of DockSpaceOverViewport() to allow passing an explicit dockspace id if desired. ( #7611 )
2024-05-21 19:00:25 +02:00
ocornut
b39fc84f89
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-05-16 19:57:04 +02:00
ocornut
7747106647
Inputs: swap Ctrl and Cmd on macOS X, remove ImGuiMod_Shortcut. ( #2343 , #4084 , #5923 , #456 )
2024-05-16 19:16:55 +02:00
ocornut
eabe98f6d5
Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)
...
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# imgui.cpp
2024-05-14 16:29:06 +02:00
ocornut
5e23680454
Backends: all backends + demo now call IMGUI_CHECKVERSION() to verify ABI compatibility between caller code and compiled version of dear imgui. ( #7568 )
2024-05-13 15:07:13 +02:00
ocornut
f48aae600a
Version 1.90.7 WIP
2024-05-13 14:47:37 +02:00
ocornut
e391fe2e66
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2024-05-08 16:17:32 +02:00
ocornut
6ccc561a2a
Version 1.90.6
2024-05-08 15:38:33 +02:00
ocornut
d4495446d5
Windows, Internal: added experimental SkipRefresh mode. ( #3515 , #4763 , #7556 , #5116 , #4076 , #2749 , #2268 )
...
currently: ImGui::SetNextWindowRefreshPolicy(ImGuiWindowRefreshFlags_TryToAvoidRefresh);
- This is NOT meant to replace frame-wide/app-wide idle mode.
- This is another tool: the idea that a given window could avoid refresh and reuse last frame contents.
- I think it needs to be backed by a careful and smart design overall (refresh policy, load balancing, making it easy and obvious to user).
- It's not there yet, this is currently a toy for experimenting.
My other issues with this:
- It appears to be very simple, but skipping most of Begin() logic will inevitably lead to tricky/confusing bugs. Let's see how it goes.
- I don't like very much that this opens a door to varying inconsistencies
- I don't like very much that it can lead us to situation where the lazy refresh gets disabled in bulk due to some reason (e.g. resizing a dock space) and we get sucked in the temptation to update for idle rather than update for dynamism.
2024-05-07 11:44:43 +02:00
ocornut
2f2d5070f5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2024-05-03 16:30:09 +02:00
thedmd
fc4d818e17
Tables: Angled headers: added TableAngledHeadersTextAlign, ImGuiStyleVar_TableAngledHeadersTextAlign. ( #6917 )
2024-05-03 12:54:59 +02:00
ocornut
5717f0a33e
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_win32.cpp
2024-04-30 10:42:46 +02:00
ocornut
913151caa8
Demo: move progress bars to their own section.
2024-04-24 19:40:26 +02:00
gan74
c895e987ad
ProgressBar: added indeterminate mode by passing an animated negative value. ( #5316 , #5370 , #1901 )
2024-04-24 19:40:26 +02:00
diego.mateos
b8a44b198c
TreeNode: added ImGuiTreeNodeFlags_SpanTextWidth. ( #6937 )
2024-04-24 19:00:58 +02:00
ocornut
baaaaea9e9
Demo: tweak TreeNode demo.
2024-04-24 18:20:09 +02:00
ocornut
4cb0fe3c7d
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# docs/CHANGELOG.txt
# imgui_internal.h
2024-04-16 14:24:13 +02:00
ocornut
3caa79c8a5
Version 1.90.6 WIP
2024-04-15 11:27:07 +02:00
ocornut
f790d51665
Silent zealous/stupid warning introduced by Clang 16 (shipping with VS2022) with -Weverything. Pointers are now illegal!
2024-04-12 16:55:32 +02:00
ocornut
1db579d458
Merge branch 'master' into docking
2024-04-11 16:21:56 +02:00
ocornut
231cbee0fc
Version 1.90.5
2024-04-11 15:54:39 +02:00
ocornut
9a2b598ec1
ListBox: Fixed text-baseline offset when using SameLine()+Text() after a labeled ListBox().
...
Visible in demo->basic->listbox
2024-04-03 10:20:18 +09:00
ocornut
d3c3514a59
Tables: Fixed auto-width columns when using synced-instances of same table. ( #7218 )
2024-03-29 19:39:05 +09:00
ocornut
37b37fc2a3
DrawList: Allow AddText() to accept null ranges. ( #3615 , 7391)
2024-03-27 10:51:42 +09:00
ocornut
5c5ae806aa
Comments
2024-03-26 14:42:51 +09:00
ocornut
085781f5ca
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-03-18 22:52:40 -07:00
cfillion
868facff9d
ImDrawList: (Breaking) merge float radius_x/radius_y parameters into ImVec2 radius in PathEllipticalArcTo(), AddEllipse(), AddEllipseFilled(). ( #2743 , #7417 )
2024-03-18 22:50:47 -07:00
Christian Fillion
0a1f5b94e3
Demo: Two minor fixes (unchecked BeginTooltip + incorrect height constraint) ( #7410 )l
2024-03-17 23:29:10 -07:00
ocornut
40df3db1a2
Tweaking terminology
2024-03-17 19:46:12 +09:00
ocornut
fd75685fb0
Merge branch 'master' into docking
2024-03-05 18:12:11 +01:00
ocornut
fbf45ad149
ImDrawList: add PathFillConcave(), AddConcavePolyFilled(): amends ( #760 )
...
- Simplify and compact some code. Shallow tweaks.
- Add comments.
- Add concave shape demo.
- Remove coarse culling.
- Remove nested types to match coding style and for consistent type nams when translated to other languages.
- Merged ClassifyNode() and ReclassifyNode().
- Extracted ImTriangleIsClockwise().
- Hold copy of points inside nodes instead of pointing to them.
2024-03-01 21:08:18 +01:00
ocornut
04f40014a6
Docs: added a mini wiki index in main source files.
2024-02-29 15:17:08 +01:00
ocornut
1a487165b1
Merge branch 'master' into docking
2024-02-27 18:44:51 +01:00
ocornut
e46d1e69ac
Version 1.90.5 WIP
2024-02-26 13:31:10 +01:00
ocornut
c6aa051629
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-02-22 20:01:46 +01:00
ocornut
277ae93c41
Version 1.90.4
2024-02-22 19:56:39 +01:00
ocornut
659fb41d0a
Debug Tools: moved DebugStartItemPicker() to public API. Added to Demo->Tools menu. ( #2673 )
2024-02-20 17:33:17 +01:00
ocornut
198c38f0b1
Demo: Custom Rendering: better demonstrate PathArcTo(), PathBezierQuadraticCurveTo(), PathBezierCubicCurveTo(), PathStroke(), PathFillConvex() functions.
2024-02-20 16:33:54 +01:00
ocornut
2b662b1ab9
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2024-02-20 15:33:20 +01:00
ocornut
405e54ebd5
Tables: Angled Headers: fixed support for multi-line labels. various padding/layout fixes. ( #6917 )
2024-02-19 20:27:20 +01:00
ocornut
8a14b71f22
Version 1.90.4 WIP
2024-02-15 16:51:57 +01:00
ocornut
d79514c407
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
2024-02-14 14:32:17 +01:00
ocornut
5b6f03213d
Version 1.90.3
2024-02-14 13:58:19 +01:00
ocornut
915c6393ad
Version 1.90.3 WIP
2024-02-12 14:54:48 +01:00
ocornut
71bcf350bd
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2024-02-09 17:26:45 +01:00
ocornut
536090303a
Version 1.90.2
2024-02-09 16:59:31 +01:00
ocornut
59c8db69eb
Demo: reorder Demo->Configuration section with docking/viewports section.
2024-02-09 15:27:35 +01:00
ocornut
5cdc4a2a41
Demo: use ImGui::MemAlloc/MemFree for consistency. ( #7300 )
2024-02-09 14:20:12 +01:00
ocornut
a27f22f0e9
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui_internal.h
2024-01-16 11:43:36 +01:00
ocornut
29809d7220
Version 1.90.2 WIP
2024-01-11 14:37:13 +01:00
ocornut
2dc85e6e43
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2024-01-10 18:34:23 +01:00
ocornut
d6cb3c923d
Version 1.90.1
2024-01-10 18:00:57 +01:00
ocornut
fdf8d02be1
Debug Tools: Added io.ConfigDebugIsDebuggerPresent and Debug Break buttons. ( #2673 )
2024-01-10 17:33:19 +01:00
ocornut
a5dec42866
Debug Tools: Debug Log: Clicking any filter with SHIFT held enables it for 2 frames only. ( #5855 )
2024-01-10 15:12:24 +01:00
ocornut
ebcfcd8da3
Merge branch 'master' into docking
2024-01-09 22:39:06 +01:00
ocornut
7938550d52
Comments and some extra line-wrapping in demo ( #3193 )
2024-01-04 11:50:38 +01:00
ocornut
4aa81116a5
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# imgui.cpp
2023-12-20 23:57:19 +01:00
ocornut
e265610a0c
Fixes for MSVC code analyzer.
2023-12-18 18:36:01 +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
6cfe3ddf52
InputTextMultiline: Tabbing through a multi-line text editor using ImGuiInputTextFlags_AllowTabInput doesn't activate it. ( #3092 , #5759 , #787 )
2023-12-14 17:15:43 +01:00
ocornut
96b5b1724b
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui_internal.h
2023-12-05 12:20:16 +01:00
ocornut
7965494ff3
Debug Tools: Added DebugFlashStyleColor() to identify a style color. Added to Style Editor.
2023-11-28 19:40:38 +01:00
ocornut
f6253b87d0
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
2023-11-28 14:39:46 +01:00
ocornut
3d083dbe1a
Version 1.90.1 WIP
2023-11-15 23:53:58 +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
b81bd7ed98
Version 1.90.0
...
w/ Changelog tweaks.
2023-11-15 15:56:05 +01:00
ocornut
75c46a3930
Demo: Partly fix resizing constraint demo. ( #6210 , #5627 )
...
Broken by 2569c6474
2023-11-13 14:53:14 +01:00
ocornut
fe6544622b
SetNextWindowSizeConstraints() clarified parameters, fixed comments. ( #1139 , #3186 , #3270 )
2023-11-13 14:13:17 +01:00
ocornut
37ea320b96
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2023-11-07 20:20:41 +01:00
ocornut
0d3b468cb3
BeginChild(): added ImGuiChildFlags_AutoResizeX, ImGuiChildFlags_AutoResizeY, ImGuiChildFlags_AlwaysAutoResize + support for SetNextWindowSizeConstraints(). ( #1666 , #1395 , #1496 , #1710 ) + Demo
...
Note that child don't report ideal content size to parent so nesting may be difficult.
Note 4e4042b
simplified SkipItems logic.
Note e2035a5
standardizing WindowMinSize application on child
2023-11-07 20:15:32 +01:00
ocornut
44345c2108
Better documented the difference between BeginListBox() and BeginChild() w/ ImGuiChildFlags_FrameStyle.
...
BeginListBox() can't yet expose child flags because coarse clipping require query of stored size (same issue as with adding resize support to Tables).
2023-11-07 20:14:54 +01:00
ocornut
fa4c49b4a7
BeginChild(): resizing is only clamped on axis where there's no scrollbar. Added an extra ResizeX in Demo->Simple Layout.
2023-11-07 19:01:35 +01:00
ocornut
cdbc21a191
BeginChild(): Added ImGuiChildFlags_FrameStyle as a replacement for BeginChildFrame(). ( #1666 , #1496 , #1395 , #1710 , #462 , #503 , #263 )
...
Effectively allows us to avoid extending BeginChildFrame() api to mimic BeginChild() new parameters.
2023-11-07 18:50:32 +01:00
ocornut
ab47efd9a0
Bits / comments
2023-11-06 18:17:12 +01:00
ocornut
9298e310b2
Merge branch 'master' into docking (note: won't build as-is, see next commit)
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2023-11-02 18:05:43 +01:00
ocornut
9235352400
BeginChild: Added ImGuiChildFlags_ResizeX and ImGuiChildFlags_ResizeY. ( #1710 )
2023-11-02 17:34:49 +01:00
ocornut
7713c29258
BeginChild: Upgraded 'bool border = true' parameter to use a ImGuiChildFlags type and the ImGuiChildFlags_Border value. (toward #1666 , #1496 , #1395 , #1710 )
2023-11-02 17:26:05 +01:00
ocornut
2a6d7b1eaa
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2023-10-18 19:45:19 +02:00
ocornut
56f7e853be
Demo: expose more Combo flags + misc tidying up.
2023-10-18 17:48:33 +02:00
ocornut
12a3c77c2f
Demo: Minor tweak to angled headers demo.
2023-10-12 20:00:34 +02:00
ocornut
83c4336828
Tables: fixed angled headers with frozen columns.
2023-10-12 19:48:29 +02:00
ocornut
f96c5443b1
Tables: fixed angled headers with frozen columns.
2023-10-12 19:47:58 +02:00
ocornut
f7fc186408
Merge branch 'master' into docking
...
+ 2 comments
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
2023-10-12 19:22:36 +02:00
ocornut
32228d8add
Tables: added Angled headers support. Added ImGuiTableColumnFlags_AngledHeader, ImGui::TableHeadersAngledRow(), style.TableAngledHeadersAngle. ( #2957 )
2023-10-12 19:21:02 +02:00
ocornut
9f851ebfe4
Tables: added ImGuiTableFlags_HighlightHoveredColumn.
2023-10-12 19:15:17 +02:00
ocornut
feddcf3030
Combo: amends for ImGuiComboFlags_WidthFitPreview. ( #6881 )
...
Amend 112d8fc
2023-10-09 11:34:05 +02:00
mpv-enjoyer
112d8fc41d
Combo: added ImGuiComboFlags_WidthFitPreview. ( #6881 )
2023-10-09 11:26:00 +02:00
ocornut
72ebd91567
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.h
2023-10-05 15:10:45 +02:00
ocornut
2c07d581de
TreeNode: Added ImGuiTreeNodeFlags_SpanAllColumns for use in tables. ( #3151 , #3565 , #2451 , #2438 )
2023-10-05 15:05:58 +02:00
ocornut
085ed7bfbe
Drag and Drop: Rework drop target highlight. ( #4281 , #3272 )
...
Amend 4ddb6b46
, 4b94738c7
2023-10-05 14:13:27 +02:00
ocornut
a63e2f0a33
Drag and Drop: Fixed submitting a tooltip from drop target location. Added demo.
...
Amend 7bbf8f2
, 92b7d6b
.
2023-10-05 12:06:40 +02:00
ocornut
f8aed6499f
Debug Tools: Rename ShowIdStackToolWindow() -> ShowIDStackToolWindow(). ( #4631 )
...
Squashed of 2 master commits.
2023-09-28 20:16:13 +02:00
ocornut
c21278eeae
Debug Tools: Rename ShowIdStackToolWindow() -> ShowIDStackToolWindow(). ( #4631 )
...
Amend 8175a47
2023-09-27 19:49:12 +02:00
ocornut
b7c250925f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2023-09-27 18:21:39 +02:00
ocornut
8175a47881
Debug Tools: Renamed ShowStackToolWindow() ("Stack Tool") to ShowIdStackToolWindow() ("ID Stack Tool"). ( #4631 )
2023-09-26 15:21:55 +02:00
ocornut
bb2fb74645
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
2023-09-26 11:42:49 +02:00
Glordim
f4790f6f66
BeginItemTooltip: Rename flag in comment ( #6853 )
2023-09-22 17:52:50 +02:00
ocornut
ef8ff1b5d8
TabBar, Style: added style.TabBarBorderSize and associated ImGuiStyleVar_TabBarBorderSize. ( #6820 , #4859 , #5022 , #5239 )
...
Cherry-picked from docking's 64b1e44
2023-09-18 15:29:42 +02:00
ocornut
64b1e448d2
TabBar, Style: added style.TabBarBorderSize and associated ImGuiStyleVar_TabBarBorderSize. ( #6820 , #4859 , #5022 , #5239 )
...
Removed ImGuiTabItemFlags_Preview. Will need cherry-picking in master.
2023-09-18 15:28:44 +02:00
ocornut
afd0d3fca1
Docking: made ImGuiDockNodeFlags_NoUndocking public. ( #2999 , #6823 , #6780 , #3492 )
...
Amend 1612813
.
2023-09-18 12:41:18 +02:00
ocornut
72d760ba00
Docking: (Breaking) renamed ImGuiDockNodeFlags_NoDockingInCentralNode -> ImGuiDockNodeFlags_NoDockingOverCentralNode, ImGuiDockNodeFlags_NoSplit -> ImGuiDockNodeFlags_NoDockingSplit.
...
Shuffled other internal flags and added comments.
2023-09-18 12:27:29 +02:00
ocornut
7e246a7bb9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2023-09-16 13:51:51 +02:00
ocornut
14f8b76c1a
Docking: Comments. Removed misleading shared/local identicators. ( #6823 , #2999 )
...
NoDocking not marked as saved (it never was). Removed unused ImGuiDockNodeFlags_LocalFlagsMask_.
2023-09-15 20:44:15 +02:00
ocornut
b101cf46b6
ListBox, Combo: Changed signature of "name getter" callback in old one-liner ListBox()/Combo() apis.
2023-09-15 18:43:04 +02:00
ocornut
9714594c35
Tooltips: made using SetItemTooltip()/IsItemHovered(ImGuiHoveredFlags_ForTooltip) defaults to activate tooltips on disabled items.. ( #1485 )
2023-09-12 11:55:34 +02:00
ocornut
357f752bed
Docs: add more links to the top of every examples and backends files.
2023-09-11 14:01:40 +02:00
ocornut
72dbe45adc
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
2023-09-08 18:02:06 +02:00
Leonardo Serrano
e3d9b875c9
ImDrawList: added PathEllipticalArcTo(), AddEllipse(), AddEllipseFilled(). ( #2743 )
...
Rebased with mods by ocornut: defaults to num_segments==0, supports for auto-tesselation, tweak demo.
2023-09-07 12:12:21 +02:00
ocornut
fb9b006865
Version 1.90 WIP
2023-09-05 16:46:52 +02:00
ocornut
c6e0284ac5
Fixed minor warning.
2023-09-04 15:16:55 +02:00
ocornut
1d8e48c161
Using range-based for where it makes sense. ( #4537 )
...
Amend 82d177c
2023-09-04 15:13:12 +02:00
ocornut
a1b60fc1f5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2023-09-04 14:59:59 +02:00
ocornut
fef3389157
Version 1.89.9
2023-09-04 14:30:32 +02:00
ocornut
e8a5c9e1b8
Tables: Made it possible to change style.CellPadding.y between rows. Added demo.
2023-09-04 11:23:54 +02:00
ocornut
8c497793f9
Demo: Tweak table sorting demo code.
2023-09-01 14:54:42 +02:00
ocornut
bdd9b96fa3
Demo: Reorganized "Examples" menu. Tweak Property Editor.
2023-08-31 20:04:43 +02:00
ocornut
82d177ccbd
Using range-based for where it makes sense. ( #4537 )
2023-08-28 12:21:44 +02:00
ocornut
676497fe05
Merge branch 'master' into docking
...
ac64b65
on master seemed incorrect.
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
2023-08-25 14:20:51 +02:00
ocornut
983b95bc87
Demo: tweak explanation about static keyword. ( #6718 )
2023-08-14 16:55:03 +02:00
ocornut
8f5ce73140
Tables: Made it possible to use SameLine(0,0) after TableNextColumn() or TableSetColumnIndex() in order to reuse line height from previous cell.
2023-08-14 13:09:39 +02:00
ocornut
63b6300c39
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2023-08-08 14:16:13 +02:00
ocornut
edebb90a9a
Demo: amend/fix for MinGW
...
Amend 4d6fbaf
.
2023-08-07 18:27:28 +02:00
ocornut
4d6fbaff11
Demo: define standard PRI names we use (if missing) instead of defininig IM_PRId64, IM_PRIu64.
2023-08-07 15:24:31 +02:00
ocornut
2b1fc6f765
Demo: Demonstrate out-of-order rendering using ImDrawListSplitter.
2023-08-06 20:13:05 +02:00
ocornut
d6d94d90bf
Version 1.89.9 WIP
...
+ Minor typo fixes
2023-08-03 19:19:21 +02:00
ocornut
f8704cd085
Merge branch 'master' into docking
2023-08-01 13:11:26 +02:00
ocornut
f7eea63872
Version v1.89.8
2023-08-01 12:53:57 +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
0e8eb8c48e
Removed _MSC_VER <= 1500 checks for Visual Studio 2008 or earlier.
...
Our codebase requires VS2012+ since a while.
2023-07-13 12:38:16 +02:00
ocornut
f6feddd1ee
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2023-07-11 12:44:15 +02:00
ocornut
b79751ebad
Docking: Added DockingSeparatorSize to style: amends ( #3481 , #4721 , #2522 )
...
Add ImGuiStyleVar_DockingSeparatorSize + misc Docking related comments.
2023-07-11 12:43:50 +02:00
PossiblyAShrub
a5aff5fd3e
Docking: Added DockingSeparatorSize to style ( #3481 , #4721 , #2522 )
...
(DockingSplitterSize in current commit, about to be renamed)
2023-07-11 12:37:40 +02:00
ocornut
3349296370
InputText: Tweak ImGuiInputTextFlags_EscapeClearsAll handling so decision is taken on input buffer + Showcase a few more InputText() flags. ( #5688 , #2620 )
...
This makes is more obvious that value_change==true when apply_new_text != NULL.
2023-07-06 19:32:01 +02:00
ocornut
9a15730c2a
Demo: better showcase use of SetNextItemAllowOverlap(). ( #6574 , #6512 , #3909 , #517 )
...
+ Merge some shallow changes from range-select branch.
2023-07-05 14:19:04 +02:00
ocornut
3fe4319314
Version 1.89.8 WIP
2023-07-05 14:17:46 +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
ocornut
cb9015e254
Version 1.89.7
2023-07-04 14:56:09 +02:00
ocornut
655aae5911
Comments + docs: tidying up todo list + demo tweak for tooltips.
2023-06-30 14:58:49 +02:00
ocornut
a88e5be7f4
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
2023-06-28 14:56:33 +02:00
ocornut
10c7709f30
Overlap: IsItemHovered: Changed behavior to return false when querying an item using AllowOverlap mode. Added ImGuiHoveredFlags_AllowWhenOverlappedByItem, ImGuiHoveredFlags_AllowWhenOverlappedByWindow., ( #6512 , #3909 , #517 )
2023-06-28 14:40:47 +02:00
ocornut
51f564eea6
(Breaking) Overlap: Renamed 'ImGuiTreeNodeFlags_AllowItemOverlap' to 'ImGuiTreeNodeFlags_AllowOverlap', 'ImGuiSelectableFlags_AllowItemOverlap' to 'ImGuiSelectableFlags_AllowOverlap'. Kept redirecting enums (will obsolete). ( #6512 , #3909 , #517 )
...
+ Internals: Renamed 'ImGuiButtonFlags_AllowItemOverlap' to 'ImGuiButtonFlags_AllowOverlap' without redirection.
2023-06-28 14:37:05 +02:00
ocornut
6b01114057
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_opengl3.cpp
2023-06-23 16:04:13 +02:00
ocornut
e0583975cd
Demo: Fix typo (amusingly had no side effect).
2023-06-20 15:18:37 +02:00
ocornut
1450d23b60
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
# imgui.cpp
2023-06-20 15:12:09 +02:00
ocornut
e7a4327eb8
IsWindowHovered: Added support for ImGuiHoveredFlags_Stationary.
2023-06-20 15:04:14 +02:00