1
0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-18 18:46:13 +01:00
Commit Graph

2450 Commits

Author SHA1 Message Date
ocornut
4e2126ee44 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_widgets.cpp
2024-10-18 18:59:27 +02:00
ocornut
ab9ce2a927 Nav: added io.ConfigNavCursorVisibleAuto, io.ConfigNavCursorVisibleAlways. (#1074, #2048, #7237, #8059, #3200, #787)
Note: the NavCursorHideFrames addition is to support 88a354585 even though ConfigNavCursorVisibleAlways is set.
2024-10-18 18:54:46 +02:00
ocornut
3982cb35dc Nav, Docs: consistently use "keyboard/gamepad" instead of sometimes "gamepad/keyboard". 2024-10-18 18:49:44 +02:00
ocornut
634a7ed988 Nav: added SetNavCursorVisible(). (#1074, #2048, #7237, #8059)
+ Further internal renaming for consistency.
2024-10-18 18:49:44 +02:00
ocornut
0bae2db77f Internals: (Breaking) renamed NavDisableMouseHover to NavHighlightItemUnderNav.
Considering adding NavHighlightItemUnderMouse as well, but would require to resolve quite a few ambiguities and for a feature we don't have yet.
2024-10-18 18:49:44 +02:00
ocornut
0536ace2b6 Internals: (Breaking) renamed RenderNavHighlight() to RenderNavCursor(), ImGuiNavHighlightFlags to ImGuiNavRenderCursorFlags. (#1074, #2048, #7237, #8059, #1712, #7370, #787)
+ referenced in #8057, #3882, #3411, #2155, #3351, #4722, #1658, #4050.
2024-10-18 18:49:43 +02:00
ocornut
23b655f8e3 Internals: (Breaking) changed g.NavDisableHighlight to g.NavCursorVisible : same logic but inverted value. (#1074, #2048, #7237, #8059, #1712, #7370, #787) 2024-10-18 18:49:43 +02:00
ocornut
7a56b41124 Nav: added io.ConfigNavEscapeClearFocusItem. (#8059, #2048, #1074, #3200) 2024-10-18 18:49:43 +02:00
ocornut
38617a5ad3 Internals: remove ImGuiInputTextFlags_NoMarkEdited and g.LockMarkEdited n favor of ImGuiItemFlags_NoMarkEdited. 2024-10-17 15:38:00 +02:00
ocornut
0f6a463fae Internals: rename ImGuiTreeNodeStackData::InFlags and ImGuiNavItemData::InFlags to ItemFlags too. 2024-10-17 15:16:05 +02:00
ocornut
e6b5cafe65 Internals: rename ImGuiLastItemData::InFlags -> ItemFlags. ImGuiNextItemData::Flags -> HasFlags to avoid mistakes. 2024-10-17 15:11:35 +02:00
ocornut
67e5f3505d InvisibleButton: disable navigation properly + added ImGuiButtonFlags_EnableNav to enable navigation. (#8057) 2024-10-16 19:56:20 +02:00
ocornut
49a9eee33f Commented out obsolete internals's SetItemUsingMouseWheel() (#2891), TreeNodeBehaviorIsOpen() (#4814, #5423, #282, #2958, #924)
+ Removed obsolete header checks for IMGUI_DISABLE_METRICS_WINDOW.
2024-10-15 10:45:10 +02:00
ocornut
514a97a9b7 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdlrenderer2.cpp
#	backends/imgui_impl_sdlrenderer2.h
#	backends/imgui_impl_sdlrenderer3.cpp
#	backends/imgui_impl_sdlrenderer3.h
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
2024-10-14 19:23:23 +02:00
ocornut
97da66209c Internals: removing ImGuiButtonFlags_Repeat (in favor of ImGuiItemFlags_ButtonRepeat), ImGuiButtonFlags_DontClosePopups (unused) 2024-10-14 19:03:33 +02:00
ocornut
ad37b79bca Nav: shallow tidying up. 2024-10-14 17:57:51 +02:00
ocornut
d885fe4dd0 (Breaking) moved ImGuiConfigFlags_NavEnableSetMousePos -> io.ConfigNavMoveSetMousePos, ImGuiConfigFlags_NavNoCaptureKeyboard -> ConfigNavCaptureKeyboard. (#2517, #2009) 2024-10-14 15:29:24 +02:00
ocornut
349af8766c InputText: ensure mouse cursor is set regardless of whether keyboard mode is enabled or not. (#6417)
+ Nav comments (#8059)
2024-10-14 13:53:13 +02:00
ocornut
fa9277d12d Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx11.h
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx12.h
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_wgpu.cpp
#	backends/imgui_impl_wgpu.h
#	imgui.h
2024-10-07 22:05:57 +02:00
ocornut
1dde20ff4a Version 1.91.4 WIP 2024-10-07 17:39:28 +02:00
ocornut
b4c96355c9 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2024-10-04 15:43:05 +02:00
ocornut
cb16568fca Version 1.91.3 2024-10-04 15:42:45 +02:00
ocornut
b3c87475a5 Drags, Slider: added ImGuiSliderFlags_ClampOnInput, ImGuiSliderFlags_ClampZeroRange. (#7968, #3361, #76) 2024-10-03 16:26:44 +02:00
ocornut
e80498f5e7 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2024-10-03 11:33:26 +02:00
ocornut
014b722963 Tooltips, Drag and Drop: Stabilized name of drag and drop tooltip window. (#8036) 2024-10-03 11:18:59 +02:00
ocornut
655fcf8287 TabBar: added TabBarQueueFocus() by name for non-docking tab bars. (#8029, #6681) 2024-09-30 19:40:16 +02:00
ocornut
793773209b Comments. Fixed warnings. 2024-09-27 19:37:48 +02:00
ocornut
ba14c70b02 Comments. Fixed warnings. 2024-09-27 19:28:54 +02:00
ocornut
d1ea03b872 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2024-09-27 19:03:25 +02:00
ocornut
199a44e31e Error Handling: fixed not rewinding to recorded tree and id stack size (#1651) 2024-09-27 19:00:57 +02:00
ocornut
30c29d291f Error Handling: enabled experimental recovery systems. (#1651, #5654)
Setup a couple of features to configure them, including ways to display error tooltips instead of assserting.
2024-09-27 19:00:56 +02:00
ocornut
8776678a46 Error Handling: replaced log callback in recovery functions with calls to IM_ASSERT_USER_ERROR(). (#1651, #5654)
This commit is not meant to be functional as-is (it will break test engine recovery). This is mostly to reduce/remove noise from upcoming commits.
2024-09-27 19:00:56 +02:00
ocornut
2360061520 Error Handling, Debug Log: added IMGUI_DEBUG_LOG_ERROR() with special handling. (#5855, #1651, #5654) 2024-09-27 19:00:56 +02:00
ocornut
9644c51183 Error handling: rework error tooltip logic (will be reused by upcoming feature). (#7961, #7669, #1651)
+ Comments
2024-09-25 18:59:08 +02:00
ocornut
d0107f5da2 Internals: misc tweaks to facilitate branch merging. 2024-09-24 21:59:51 +02:00
ocornut
aa81272900 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
2024-09-24 20:31:26 +02:00
ocornut
726aad8e08 Refactor: moved ImGuiContext contructor to imgui.cpp 2024-09-24 20:24:51 +02:00
ocornut
44a73be6ea TestEngine: log calls don't need testing hook active.
Docs: tweak comments on BeginDisabled(false)/EndDisabled() pairs.
2024-09-24 20:22:53 +02:00
ocornut
bc77041b57 Error Handling: fixed an issue ErrorCheckEndWindowRecover() when aborting in a child inside a tab bar. (#1651) 2024-09-23 16:45:28 +02:00
ocornut
10fe2b674a Merge branch 'master' into docking 2024-09-20 18:43:48 +02:00
ocornut
fb410463e6 Scrollbar: added io.ConfigScrollbarScrollByPage setting. (#8002, #7328) 2024-09-20 18:40:32 +02:00
ocornut
d0750ee4e7 Error check: clarified that carriage returns are emitted by our code. Added helper default callback. Comments. (#1651)
(doesn't affect test engine hook for it as trailing \n are trimmed anyhow)
2024-09-20 17:09:33 +02:00
ocornut
faca859043 Version 1.91.3 WIP 2024-09-19 15:51:06 +02:00
ocornut
bc77cccd31 Merge branch 'master' into docking 2024-09-19 14:52:43 +02:00
ocornut
a9f72ab681 Version 1.91.2 2024-09-19 14:47:13 +02:00
ocornut
8040c02b32 Viewports: fixed an issue where a window manually constrained to the main viewport while crossing over main viewport bounds isn't translated properly. (#7985)
Amend 967073ba3
2024-09-16 12:05:25 +02:00
ocornut
8326dabe5e Merge branch 'master' into docking 2024-09-12 23:19:26 +02:00
ocornut
19accb14a9 InputText: amends: fixed undo-stack reconcile. fixed metrics crash. fixes character filtering. (#7925)
Refer to imgui_test_suite for tests.
2024-09-11 14:46:29 +02:00
ocornut
1674fe96ff InputText: amends: add stb_textedit_text() api. (#7925)
It seems sensible to push this change in stb_textedit repo eventually.
2024-09-11 14:46:29 +02:00
ocornut
d1b7817959 InputText: amends: renames, coding style. (#7925) 2024-09-11 14:46:29 +02:00