mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-10 07:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,441 Commits 9 Branches 149 Tags
2bf57bbad46b223f6ac519d6e012dbbdab2a1b40
Commit Graph

2808 Commits

Author SHA1 Message Date
ocornut
e11ad6b77e Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
 2025-05-19 18:48:22 +02:00
ocornut
415dddf0fa Tooltips: tooltips have a maximum size corresponding to host display/monitor size. 2025-05-19 18:42:55 +02:00
ocornut
cdb5cbe6f8 (Breaking) Commented out ImGuiListClipper::ForceDisplayRangeByIndices() which was obsoleted in 1.89.6. 
Amend ecb0aaa.
 2025-05-15 17:44:27 +02:00
ocornut
d93d918eca (Breaking) Commented out PushAllowKeyboardFocus()/PopAllowKeyboardFocus() which was obsoleted in 1.89.4. (#3092) 
Amend e83fb46.
 2025-05-15 17:43:27 +02:00
ocornut
6d939fcedc (Breaking) TreeNode: renamed ImGuiTreeNodeFlags_NavLeftJumpsBackHere to ImGuiTreeNodeFlags_NavLeftJumpsToParent for clarity. (#1079, #8639) 2025-05-15 17:35:29 +02:00
ocornut
c008c7d494 Merge remote-tracking branch 'origin/master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2025-05-15 14:45:15 +02:00
ocornut
c90ea1315a Viewports: added per-viewport FramebufferScale, Platform_GetWindowFramebufferScale() + Backends: GLFW, SDL2, SDL3, Apple: added support. (#1065, #1542, #1676, #1786, #2826, #3757, #5081, #5580, #5592, #6465, #7273, #7779 etc.) 
)

Metal backend is not in charge of writing to DpiScale/FramebufferScale (tho it was a neat workaround).
 2025-05-15 14:43:30 +02:00
ocornut
b5a73033ab Examples: Apple: Amend build scripts and gitignore, fix misc OSX warnings. (#8637) 
# Conflicts:
#	backends/imgui_impl_metal.mm
 2025-05-14 18:23:31 +02:00
ocornut
61242e2e6a InputText: fixed cursor positioning issue using up/down keys on non-ASCII text. (#8635, #7925) 
Bug introduced in abd07f6d30.
Ref https://github.com/nothings/stb/issues/188
 2025-05-14 11:37:55 +02:00
ocornut
08689c51a9 Backends: GLFW, SDL2, SDL3: include GLFW/SDL version number in io.BackendPlatformName. 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2025-05-13 15:50:51 +02:00
WSSDude
ba513ba804 Backends: DX10, DX11, DX12: honor FramebufferScale. (#8412) 
# Conflicts:
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
 2025-05-07 19:19:30 +02:00
ocornut
1c8fad73f8 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
 2025-05-07 15:24:46 +02:00
ChrisTom-94
bbc89b6391 Backends: Vulkan: fixed validation errors during window detach in multi-viewport mode. (#8600, #8176) 2025-05-07 15:23:03 +02:00
ocornut
64a5e27486 Docs: bad merge error. 2025-05-07 14:22:19 +02:00
ChrisTom-94
d1dc2a3298 Backends: Vulkan: Load dynamic rendering functions using vkGetDeviceProcAddr() + try both non-KHR and KHR versions. (#8600, #8326, #8365) 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	docs/CHANGELOG.txt
 2025-05-07 11:50:32 +02:00
ocornut
c5e2bb7cd1 Backends: SDLGPU3: Fixed creating atlas texture earlier than other backends. 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
 2025-05-05 19:20:12 +02:00
ocornut
ef62aa7333 Backends: SDL3: macOS: Fixed secondary-viewports not appearing on a different monitor than the main viewport. 2025-05-05 19:04:18 +02:00
ocornut
c0dfd65d67 Backends: Win32: Fixed an issue where externally losing mouse capture (due to e.g. focus loss) would fail to claim it again the next subsequent click. (#8594) 2025-04-30 16:23:58 +02:00
ocornut
20066a8964 Examples: DirectX12+Win32: also test for IsIconic() for sleeping since we don't seem to get a DXGI_STATUS_OCCLUDED signal when minimized. (#8603) 
Amend ec1d2be96f. (#2496, #3907, #6308, #7615)
This technically prevents multi-viewports from working with io.ConfigViewportsNoDefaultParent=true but this is a more fringe case to handle for our example app, better tradeoff imho to use IsIconic().
 2025-04-30 11:30:06 +02:00
ocornut
75ddd9a6cd Backends: SDLGPU3: added support for ImDrawCallback_ResetRenderState. (#8599) 2025-04-28 23:10:43 +02:00
ocornut
cbb8edb0b7 Tables: fixed an assert when combining Tables, Frozen Rows, Clipper and BeginMultiSelect() in a certain order. (#8595, #8250) 
The table->CurrentColumn != -1 test in BeginMultiSelect() was affected. It would have been possible to amend the test with table->IsInsideRow but this seems generally saner.

Docs: fixed typo. (#8592)
 2025-04-26 15:44:51 +02:00
ocornut
fcdaa32793 Backends: GLFW: Disable multi-viewports under Wayland. (#8587) 2025-04-26 14:54:09 +02:00
ocornut
fe298cf984 Revert "Backends: SDL2, SDL3: viewports created with ImGuiViewportFlags_NoInputs are passing SDL_WINDOW_TOOLTIP to SDL_CreateWindow(). (#8576)" 
This reverts commit 2a000ee091.
 2025-04-25 20:10:46 +02:00
ocornut
2a000ee091 Backends: SDL2, SDL3: viewports created with ImGuiViewportFlags_NoInputs are passing SDL_WINDOW_TOOLTIP to SDL_CreateWindow(). (#8576) 
Which reduces issues related to losing key down state on focus loss.
 2025-04-23 19:12:32 +02:00
ocornut
839e3274e1 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp
 2025-04-23 14:42:36 +02:00
ocornut
dcf0d8cab6 Tables: fixed TableHeader() eager vertical clipping of text. (#6236) 2025-04-22 18:34:56 +02:00
ocornut
bf0f586b69 Platform IME: added ImGuiPlatformImeData::WantTextInput, ViewportId. Backends: SDL3: honor WantTextInput. (#8584, #7492, #6341) 2025-04-22 11:21:02 +02:00
ocornut
87f12e56fe Backends: SDL_GPU: Added multi-viewport support. Amends + update example. (#8573, #8163, #7998, #7988) 2025-04-17 15:41:15 +02:00
ocornut
88d2df24be Merge branch 'master' into docking 2025-04-16 20:31:18 +02:00
ocornut
69d572bb10 Fonts: reworked text ellipsis logic to ensure a "..." is always displayed instead of a single character. (#7024) 
Requires 97d85338e8 and e4a865177e
 2025-04-16 20:30:29 +02:00
ocornut
97d85338e8 Tabs: adjust handling of ellipsis now that Close Button visibility changed. (#8387) Internals: remove extra parameter to RenderTextEllipsis(). 
This requires RenderTextEllipsis() to use fine CPU-side clippoing.
Users of RenderTextEllipsis(): #7024, #6236, #5267, #5745, #4269, #2775
 2025-04-16 20:29:43 +02:00
ocornut
7ab4728a36 Error Handling: added better error report and recovery when calling EndFrame() or Render() without NewFrame(). 2025-04-16 18:12:53 +02:00
ocornut
3ab50c334a TreeNode, Style: added style.TreeLinesRounding support. (#2920) 2025-04-10 19:26:29 +02:00
ocornut
f4d9359095 Merge branch 'master' into docking 2025-04-10 17:26:11 +02:00
ocornut
8c977bf7b3 TreeNode, Tables: fixed ImGuiTreeNodeFlags_DrawLinesXXX feature when TreePop() is called in table: in no column or at top of row. (#2920) 2025-04-10 16:53:14 +02:00
ocornut
bbb0f0ade4 TreeNode: fixed incorrect clipping of arrow/bullet when using ImGuiTreeNodeFlags_SpanAllColumns. 2025-04-10 14:08:17 +02:00
ocornut
06c2c9f456 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
 2025-04-09 19:08:45 +02:00
Zane van Iperen
74e453cf15 Backends: SDL2, SDL3: don't attempt to call SDL_CaptureMouse() on drivers where we don't call SDL_GetGlobalMouseState(). (#8561) 2025-04-09 14:58:32 +02:00
ocornut
b811c42034 Backends: SDL2/SDL3: revert updating monitors and work area info every frame. Workaround for Windows. (#8415, #8558) 
Partly revert logic from 1a7b5945c7.
 2025-04-09 14:28:43 +02:00
ocornut
789de09dda TreeNode: extracted TreeNodeDrawLineToChildNode() for usage by custom widgets (#2920) 2025-04-09 12:04:09 +02:00
ocornut
47d1ab192a Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui_widgets.cpp
 2025-04-08 19:59:38 +02:00
ocornut
39f34e1e58 TreeNode: Don't latch GetColorU32(ImGuiCol_TreeLines). (#2920) 
Trade off doesn't seem worth it for large trees. User who really needs to alter colors can do it by adjusting Push/Pop locations.
 2025-04-08 19:58:59 +02:00
ocornut
e5b218e6d1 TreeNode: added ImGuiTreeNodeFlags_DrawTreeXXX flags. (#2920) 
# Conflicts:
#	docs/CHANGELOG.txt
 2025-04-08 19:58:59 +02:00
ocornut
faa03031b4 Windows: loosened code to handle ImGuiButtonFlags_FlattenChildren so that master matches docking. (#8554) 
This essentially merges 059560d2 back into master.
 2025-04-07 18:21:34 +02:00
ocornut
91652c317e Backends: Vulkan: Deep-copy ImGui_ImplVulkan_InitInfo::PipelineRenderingCreateInfo's pColorAttachmentFormats buffer when set, in order to reduce common user-error of specifying a pointer to data that gets out of scope. (#8282) 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	docs/CHANGELOG.txt
 2025-04-07 16:40:14 +02:00
ocornut
b4bd596a39 Fonts: word-wrapping code handle ideographic comma & full stop (U+3001, U+3002). (#8540) 2025-04-01 22:57:07 +02:00
ocornut
fcab22f80f Fonts: fixed CalcWordWrapPositionA() fallback when width is too small to wrap with multibyte codepoints.. (#8540) 2025-04-01 22:57:07 +02:00
Shixian Sheng
8098d79ca2 Docs: fixed link typo (#8538) 2025-04-01 09:10:30 +02:00
ocornut
4bdb0ac685 Comments 2025-03-31 15:12:28 +02:00
ocornut
b6786595a4 Backends: SDLGPU3: Made ImGui_ImplSDLGPU3_PrepareDrawData() reuse GPU Transfer Buffers which were unusually slow to recreate every frame. (#8534) 2025-03-31 14:45:29 +02:00