mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-13 21:19:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,788 Commits 9 Branches 127 Tags 419 MiB
676497fe05
Commit Graph

1943 Commits

Author SHA1 Message Date
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
dc3e531ff2 Merge branch 'master' into docking 2023-07-04 16:22:25 +02:00
ocornut
d4ddc46e77 InputText: Fixed a crash on deactivating a ReadOnly buffer. (#6570, #6292, #4714) 
This will be part of 1.89.7 Tagged relase.
 2023-07-04 16:20:51 +02:00
ocornut
40aac5875a Changelog amends 2023-07-04 15:48:42 +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
121072cfe6 Backends: Vulkan: Amend for support for dynamic_rendering (#5446, #5037) 
Simplified for master branch.

# Conflicts:
#	backends/imgui_impl_vulkan.cpp
 2023-07-04 14:16:28 +02:00
ocornut
64172685d6 InputText: ImGuiInputTextCallbackData::InsertChars() accept (NULL,NULL) range, in order to conform to common idioms. (#6565, #6566, #3615) 2023-07-03 11:58:17 +02:00
ocornut
655aae5911 Comments + docs: tidying up todo list + demo tweak for tooltips. 2023-06-30 14:58:49 +02:00
ocornut
a02315e1c4 Combo: Made simple/legacy Combo() function not returns true when picking already selected item. (#1182) 2023-06-28 15:47:10 +02:00
ocornut
a88e5be7f4 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 2023-06-28 14:56:33 +02:00
ocornut
6137443d24 Overlap: moved ImGuiItemflags_AllowOverlap handling from ButtoBehavior() to ItemHoverable() now that it is possible. (#6512, #3909, #517) 
This allows DragXXX, SliderXXX, PlotXXX etc to honor SetNextItemAllowOverlap().
 2023-06-28 14:42:14 +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
8439a73645 Overlap: Added 'SetNextItemAllowOverlap()' as a replacement for 'SetItemAllowOverlap()'. (#6512, #3909, #517) 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 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
06f5b46133 Overlap: Fixed first frame of an overlap highlighting underlying item if previous frame didn't hover anything. (#6512, #3909, #517) 2023-06-27 15:46:35 +02:00
ocornut
d5d4d709c7 Drag and Drop: moved "drag souce doesn't report as hovered" from ButtonBehavior() to ItemHoverable(). 
Ensure DragXXX, SliderXXXX, InputText, PlotXXX follow same logic. Amend 251f178a6, a33f0d1f7
 2023-06-27 14:44:39 +02:00
ocornut
3ec128c5fd Selectable, TreeNode: When using ImGuiSelectableFlags_AllowOverlap/ImGuiTreeNodeFlags_AllowOverlap and holding item held, overlapping widgets won't appear as hovered. (#6512, #3909) 
Essentially we are going to remove calls to SetItemAllowOverlap() and standardize the fact that only 'HoveredId == id' test from it is performed.

# Conflicts:
#	imgui_widgets.cpp
 2023-06-26 19:08:10 +02:00
ocornut
0a53b45858 CollapsingHeader/TreeNode: Fixed text padding when using _Framed+_Leaf flags. (#6549) 2023-06-26 11:15:55 +02:00
ocornut
6b01114057 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
 2023-06-23 16:04:13 +02:00
ocornut
66c09fc05b Docking+Viewports: Fixed extraneous viewport+platform-window recreation. Part 1. 
Part 1: Add counters. Amend logs.
Refer to "viewport_owner_change_1" and "viewport_owner_change_2" in ImGuiTestSuite.
 2023-06-23 15:49:45 +02:00
ocornut
7d81a166f9 Docking: Fixed one-frame flickering on reappearing windows binding to a dock node where a later-submitted window was already bound. 2023-06-23 15:49:45 +02:00
ocornut
6b2e03c5b1 GetKeyName(): Fixed assert with ImGuiMod_XXX values when IMGUI_DISABLE_OBSOLETE_KEYIO is set. 2023-06-22 22:03:02 +02:00
ocornut
e4aeef4b9f Viewports: Closing a viewport via OS/platform means (e.g. OS close button or task-bar menu), mark all windows in this viewport as closed. 2023-06-21 15:34:51 +02:00
ocornut
94c46d7486 InputText: Fixed not returning true when buffer is cleared by ImGuiInputTextFlags_EscapeClearsAll. (#5688, #2620) 2023-06-21 14:20:13 +02:00
ocornut
cb5542bce5 Backends: OpenGL3: Fixed erroneous use glGetIntegerv(GL_CONTEXT_PROFILE_MASK) on contexts lower than 3.2. (#6539, #6333) 2023-06-20 15:30:52 +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
9214c28aad IsWindowHovered, IsItemHovered: Assert when passed any unsupported flags. 2023-06-20 15:04:15 +02:00
ocornut
e7a4327eb8 IsWindowHovered: Added support for ImGuiHoveredFlags_Stationary. 2023-06-20 15:04:14 +02:00
ocornut
b60acfa87d Tooltips: Added SetItemTooltip(), BeginItemTooltip(). Improved Demo section. 2023-06-20 15:04:14 +02:00
ocornut
0f72652c2d IsItemHovered, Tooltips: Added io.HoveredFlagsForTooltipMouse, io.HoveredFlagsForTooltipNav now pulled by ImGuiHoveredFlags_Tooltip. (#1485) 2023-06-20 15:04:14 +02:00
ocornut
b3b8cbd001 IsItemHovered, Tooltips: Added ImGuiHoveredFlags_ForTooltip, ImGuiHoveredFlags_Stationary. (#1485) 
Update demo accordingly.
 2023-06-20 15:04:14 +02:00
ocornut
d4b94bd65b (Breaking) Moved io.HoverDelayShort/io.HoverDelayNormal to style.HoverDelayShort/style.HoverDelayNormal. (#1485) 2023-06-20 15:04:13 +02:00
ocornut
f09ef23ae6 IsItemHovered, Tooltips: Tweak default delay again. (#1485) 
Amend eec344c
 2023-06-20 14:43:38 +02:00
ocornut
b9db5c566b Backends: Win32: Added support for updating ParentViewportID after viewport creation. 
This tends to be desirable for applicaton manipulating this value via ImGuiWindowClass::ParentViewportID.
I thought it would be a simple call to SetParent(), it's only slightly more complicated but added comments about it.
 2023-06-15 11:26:27 +02:00
ocornut
89d3dabf2e Modals: In the case of nested modal, made sure that focused or appearing windows are moved below the lowest blocking modal (rather than the highest one). (#4317) 
Fix FindBlockingkModal() which didn't do what the comments say for the first 2 lines.
This is also fixing a crash in FindBlockingModal() which can only happen with dock node, see "window_popup_nested_interruptions_2" and viewport_platform_focus_4" tests.
The dock-node related crash comes from the fact that automatic dock node and implicit debug window don't share a common ancestor, so ParentWindowInBeginStack ends up NULL before the loop had a chance to find a match.
 2023-06-14 21:58:28 +02:00
ocornut
eec344cc1e Tweak HoverDelayClearTimer. Not exposing since I am unsure logic is viable (and is rather complex with upcoming addition of stationary logic). (#1485) 
+ Tweaked default value of io.HoverDelayNormal from 0.30 to 0.35.
 2023-06-14 18:29:49 +02:00
ocornut
534340cd88 Tooltips: Tweak default offset for non-drag and drop tooltips. 2023-06-13 15:27:46 +02:00
ocornut
e95d66faa8 Clipper: Rework inner logic to allow functioning with a zero-clear constructor. (#5856) 2023-06-13 14:55:02 +02:00
ocornut
ef07ddf087 Debug Tools: Added 'io.ConfigDebugIniSettings' option to save .ini data with extra comments. 
Moved from compile-time to runtime flag. Applied docking specific change to this cherry-picked commit.

# Conflicts:
#	docs/CHANGELOG.txt
 2023-06-13 11:55:21 +02:00
ocornut
9c16976749 Debug Tools: Added 'io.ConfigDebugIniSettings' option to save .ini data with extra comments. 
Moved from compile-time to runtime flag. Note: commit in master is not particularly useful. Docking version will add stuff.
 2023-06-13 11:54:29 +02:00
ocornut
fa5d2656b0 Docking: DockBuilderDockWindow() API calls don't clear docking order if the target node is same as existing one 
+ Add more debug log + Display DockOrder in metrics.
 2023-06-13 11:37:35 +02:00
ocornut
3cc9d2051a Examples: Win32+OpenGL3: Fixed not calling DefWindowProcW() as with other Win32 examples. (#6516, #5725, #5961, #5975) 
Amend fe0a24f
 2023-06-13 11:24:09 +02:00
ocornut
3f63cee4c1 Docking: Fixed dragging from title-bar empty space (#5181, #2645) 
This would need a test in ImGuiTestSuite.
 2023-06-12 15:33:20 +02:00
ocornut
884e3fd21f Backends: GLFW: Accept glfwGetTime() not returning a monotonically increasing value. (#6491, #6189, #6114) 2023-06-12 11:58:17 +02:00
ocornut
dec082ff97 Backends: OpenGL3: Fixed support for glBindSampler() backup/restore on ES3. (#6375, #6508) 
Amend dd9db5e8 + 39f7248d4
 2023-06-12 11:45:11 +02:00
ocornut
0664877998 Merge branch 'master' into docking 2023-06-09 14:02:19 +02:00
ocornut
4fab72b40e BeginChild/Tables: Fixed BeginChild temporary activation id collision. Fixes regression in 1.89.6 leading to the first column of tables with either ScrollX or ScrollY flags from being impossible to resize. (#6503) 2023-06-09 14:01:21 +02:00
ocornut
61ebb37843 Version 1.89.7 WIP 2023-06-01 11:22:43 +02:00
ocornut
823a1385a2 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlrenderer.h
#	docs/CHANGELOG.txt
#	imgui.cpp
 2023-05-31 14:51:56 +02:00
ocornut
5319d1cffa Version 1.89.6 2023-05-31 14:47:32 +02:00
ocornut
075b975fed Fonts: Fixed crash when manually specifying an EllipsisChar that doesn't exist. (#6480) 2023-05-31 14:44:29 +02:00
ocornut
b476184574 Backends: SDLRenderer3: Amend/finish SDL_Renderer3 patch + add example. (#6286) 2023-05-30 20:36:07 +02:00
ocornut
88e7d773df Backends: SDL_Renderer2: Renamed 'imgui_impl_sdlrenderer.h/cpp' to 'imgui_impl_sdlrenderer2.h/cpp' (#6286) 2023-05-30 20:11:19 +02:00
ocornut
3418d50949 Viewports: Fixes erroneous popup closure on closing a previous popup. (#6462, #6299) 
Avoid applying imgui-side focus when focus change is due to a viewport destruction.
 2023-05-30 17:09:27 +02:00
ocornut
19b436f68d Backends: GLFW: Preserve monitor list when there are no monitor. (#5683) 2023-05-25 15:38:35 +02:00
ocornut
7e03ae3240 Window: Fixed resizing from upper border when io.ConfigWindowsMoveFromTitleBarOnly is set. (#6390) 2023-05-25 15:23:01 +02:00
ocornut
08145bc45c Fonts: Fixed crash when merging fonts and the first font has no valid glyph. (#6446) 2023-05-23 10:56:41 +02:00
ocornut
54c1ac3e38 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2023-05-22 10:10:29 +02:00
ocornut
45c8c3b611 Listbox: commented out obsolete/redirecting functions that were marked obsolete more than two years ago: ListBoxHeader(), ListBoxFooter(). 
+ Added default parameter to SeparatorEx() amend 2c558d5
 2023-05-22 10:09:20 +02:00
ocornut
df8667b18b Comments/typos tweaks 2023-05-20 18:07:31 +02:00
ocornut
e590b5114e Viewports: Fixed loss of imgui-side focus when dragging a secondary viewport back in main viewport. (#6299) 
Amend d2291df55, 63370be0e, dcb6335bfe
 2023-05-20 14:22:01 +02:00
GamingMinds-DanielC
e489e40a85 Clipper: Amend ecb0aaa (#6424, #3841) 2023-05-15 14:06:16 +02:00
ocornut
ecb0aaa7c2 Clipper: Renamed ForceDisplayRangeByIndices() to IncludeRangeByIndices(). (#6424, #3841) + commented out obsolete ImGuiListClipper() constructor. 2023-05-15 12:06:29 +02:00
ocornut
530134d125 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
 2023-05-10 12:57:37 +02:00
ocornut
430c05991c Docs: added more detailed information about UTF-8 encoding. 
+ Revert mistakenly committed Win32+DX11 main.cpp from last commit.
 2023-05-10 12:54:51 +02:00
ocornut
513af1efc9 Examples: Updated all Visual Studio project file to use /utf-8 option, so string literals are UTF-8 encoded by default. 
(Not to misake with "Character Set" "Use Unicode Character Set" "Use Multi-Byte Character Set" which is a VS/Windows SDK thing but not a compiler-encoding thing.)
 2023-05-10 12:34:11 +02:00
ocornut
0397321be0 Debug Tools: Added 'io.ConfigDebugIgnoreFocusLoss' option. (#4388, #4921) 2023-05-09 20:28:08 +02:00
ocornut
6656553fa4 Nav: Record/restore preferred position on each given axis. 
Tagging #6344 #6003 #2694 #1688 as it relates to scoring, however this doesn't technically fix any of them fully yet.
But e.g. once we restore axial path for #2694 this commit will allow going back and forth to initial location.
 2023-05-09 17:26:27 +02:00
Jason Millard
39f7248d4a Backends: OpenGL3: Add glBindSampler for GL ES 3.0. (#6375) 
Amended given addition of GlProfileIsES3 in dd9db5e
 2023-05-09 15:17:18 +02:00
ocornut
6cdedf5834 Drag, Sliders: if the format string doesn't contain any %, when using CTRL+Click to input we use a default format. (#6405) 2023-05-09 12:04:04 +02:00
ocornut
5dc6013713 Backends: SDL3: Fixed build on Emscripten/iOS/Android. (#6391) 2023-05-04 17:06:36 +02:00
ocornut
7c291ba31b Tables: Fixed command merging when compiling with VS2013. (#6377) 2023-04-28 13:58:59 +02:00
ocornut
031e152d29 Examples: DX9, DX10, DX11: Queue framebuffer resize instead of processing in WM_SIZE. (#6374) 2023-04-27 14:57:09 +02:00
ocornut
15da1a9abc Fixed misleading local name (#4493) + minor typo (#6369) 2023-04-25 16:39:02 +02:00
Koostosh
fd943182bd ImVec2: Added unary minus operator (#6368) 2023-04-25 16:24:50 +02:00
ocornut
594cc4793a Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2023-04-25 12:21:16 +02:00
ocornut
d3ad2f357f Menus: Fixed an issue when opening a menu hierarchy in a given menu-bar would allow opening another via simple hovering. (#3496, #4797) 
Amend 48f26333
 2023-04-25 12:17:37 +02:00
ocornut
b47507951e Nav: Fixed CTRL+Tab into a root window with only childs with _NavFlattened flags erroneously initializing default nav layer to menu layer. 2023-04-24 21:00:00 +02:00
kimidaisuki22
565aa0b763 Examples: Vulkan: pick integrated GPU if nothing else is available. (#6359) 2023-04-24 12:17:49 +02:00
ocornut
d2291df551 Viewports: Fixed setting focus from platform decoration from accidentally closing modals (#6299, #6357) 
+ Fixed double-assignment static analyzer warning.

# Conflicts:
#	imgui.cpp
 2023-04-21 19:22:41 +02:00
ocornut
bba39762dc Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2023-04-21 19:12:11 +02:00
ocornut
c11128891e Backends: SDL2/SDL3: Update monitor list when receiving a display event. (#6348) 2023-04-21 15:40:14 +02:00
ocornut
adf693c061 Viewports: added void* ImGuiPlatformMonitor::PlatformHandle field (backend-dependant). 2023-04-21 15:31:14 +02:00
ocornut
00d3f9295e Nav: Fixed navigation within tables/columns where item boundaries goes beyond columns limits. (#2221) 2023-04-20 16:42:52 +02:00
ocornut
662ce46971 Debug Log: Fixed not parsing 0xXXXXXXXX values when the identifier is at the end of the line. 2023-04-20 14:52:59 +02:00
ocornut
4f692ba840 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
 2023-04-19 16:35:50 +02:00
ocornut
9308cfdcfb Examples: Amend Win32/Winapi + OpenGL example. (#3218, #5170 and #6086, #2772, #2600, #2359, #2022, #1553) 2023-04-19 16:28:15 +02:00
ocornut
a338b78eb9 Backends: OpenGL3: amend reset GL_POLYGON_MODE separately for front and back when possible. (#6333) 2023-04-19 11:55:40 +02:00
lukaasm
0948cfc19e InputText: do not set WantTextInputNextFrame during the frame InputText is deactivated. (#6341) 2023-04-18 11:35:12 +02:00
lukaasm
e49d31a1c9 Tables: do not show empty tooltip when user submits TableHeader with no label to display. (#6342) 2023-04-18 11:25:07 +02:00
Faisal Arshed
f94a8344f6
Fix minor typos in FAQ (#6328) 2023-04-17 15:00:10 +02:00
Gereon V
055e71518e Backends: clear bits set in io.BackendFlags on backend Shutdown(). Clear BackendPlatformName. (#6334, #6335) 
Amended with fix for missing clear for ImGuiBackendFlags_HasGamepad.
 2023-04-17 14:57:12 +02:00
Gereon V
f304603e13 Backends: GLUT: remove call to ImGui::NewFrame() from ImGui_ImplGLUT_NewFrame(). (#6337) 2023-04-17 14:44:56 +02:00
ocornut
064153fca4 Version 1.89.6 WIP 2023-04-17 14:40:00 +02:00
ocornut
0ea3b87bd6 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
 2023-04-13 16:24:09 +02:00
ocornut
1ebb913827 Version 1.89.5 2023-04-13 16:17:49 +02:00
ocornut
6324280432 Examples: Vulkan: rework extensions setup + enable some to avoid validation layer errors. (#6109, #6172, #6101) 
Enable VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME, VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR
 2023-04-13 15:48:19 +02:00
ocornut
995f92a456 Nav: Made PageUp/PageDown/Home/End navigation also scroll parent windows. 
+ Added ImGuiDebugLogFlags_EventSelection unused in this branch.
 2023-04-12 21:38:47 +02:00