mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-26 12:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,732 Commits 10 Branches 147 Tags
3f0699cf02b07c8312edbcd937f1881e3564d1ac
Commit Graph

6160 Commits

Author SHA1 Message Date
ocornut
942b64abfc Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2024-10-24 18:15:51 +02:00
Eugene Sandulenko
062e580436 Fixed copy/paste error in DebugModeWindow() (#8094) 2024-10-24 09:26:57 +02:00
ocornut
41f02825fc Version 1.91.5 WIP 2024-10-23 12:16:28 +02:00
ocornut
c71e4e8c7c Merge branch 'master' into docking 2024-10-18 22:04:08 +02:00
ocornut
83b64b8be2 Version 1.91.4 2024-10-18 21:45:36 +02:00
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
1ff9768aa3 Nav: (Breaking) renamed ImGuiCol_NavHighlight to ImGuiCol_NavCursor. (#1074, #2048, #7237, #8059, #1712, #7370, #787) 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
706438a43c Disabled: clicking a disabled item focuses parent window. Fix/amend 83ecc84. (#8064) 
83ecc84 was too not supporting widgets using ItemHoverable() directly + too complex.
Revert 83ecc84 in ButtonBehavior(), reimplement in UpdateMouseMovingWindowEndFrame()>
 2024-10-17 11:39:23 +02:00
ocornut
b0185efd24 Tooltips: fixed incorrect tooltip positioning when using keyboard/gamepad navigation (1.91.3 regression). (#8036) 
Regression in 1.91.3 commit 5109a77.
 2024-10-14 19:36:50 +02:00
ocornut
50de550ecd Tooltips: fixed incorrect tooltip positioning when using keyboard/gamepad navigation (1.91.3 regression). (#8036) 
Regression in 1.91.3 commit 5109a77.
 2024-10-14 19:34:23 +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
42f47590f9 Fixed ad37b79 breaking IsItemHovered()->IsItemFocused() passthrough for navigation. 
+ Backends: comments.
 2024-10-14 19:22:05 +02:00
ocornut
462d167456 Nav: rectangle highlight not rendered for items with ImGuiItemFlags_NoNav. (#8057) 
Not fully honored in ItemHoverable/IsItemHovered, seems more destructive. This is mostly designed to avoid rectangle being rendered by large InvisibleButton() when ctrl+tabbing back to a window with a big one.
 2024-10-14 17:57:51 +02:00
ocornut
ad37b79bca Nav: shallow tidying up. 2024-10-14 17:57:51 +02:00
ocornut
626d358e55 Nav: fixed Ctrl+Tab so when starting with no focused window it starts from the top-most window. (#3200) 2024-10-14 17:10:36 +02:00
ocornut
b001038901 Nav: added io.ConfigNavEscapeClearFocusWindow to clear focused window on Escape. (#3200) 
+ pressing escape to hide nav highlight doesn't clear location from when ctrl+tabbing back into same window later.
 2024-10-14 16:57:34 +02:00
ocornut
ba5161740e Amend d885fe4, fixes default value of ConfigNavCaptureKeyboard. (#2517, #2009) 2024-10-14 16:52:25 +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
20ae8bd4c3 Error Handling: turned IsItemHovered()/IsWindowHovered() checks into IM_ASSERT_USER_ERROR. (#1651) 2024-10-14 10:22:24 +02:00
ocornut
c4bc674482 IO: WantCaptureKeyboard is never set when ImGuiConfigFlags_NoKeyboard is enabled. (#4921) 
+ Retroactively add missing changelog item in 1.90
+ Backends: Vulkan: use GetTexID() for consistency.
 2024-10-11 15:31:17 +02:00
ocornut
92b94980c6 (Breaking) Default ImTextureID to use a Im64 instead of void* (#1641) 2024-10-08 14:21:44 +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
3d399bceca Docs: amend docs to explain case of using multiple overlayed ButtonBehavior(). (#8030, #7961, #7669) 2024-10-03 16:49:38 +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
5109a77f69 Tooltips: Tooltips triggered from touch inputs are positionned above the item. (#8036) 2024-10-03 11:18:59 +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
f0575411c0 Tooltips, Drag and Drop: Fixed an issue where the fallback drag and drop payload tooltip appeared during drag and drop release. 
E.g. it would otherwise appear when releasing a color button payload.
 2024-10-02 15:24:41 +02:00
ocornut
03f007d4cd Comments (#1651) 2024-09-30 14:31:51 +02:00
ocornut
29cff2be06 Silence PVS Studio static analyzer false positives. 2024-09-28 16:54:45 +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