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,842 Commits 10 Branches 147 Tags
cbf9e3f554e6e3a263f08cb82b14b38beb06016f
Commit Graph

1860 Commits

Author SHA1 Message Date
ocornut
23c9362550 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2025-07-31 23:44:44 +09:00
ocornut
3ef6c8410a Tabs: added new fitting policy ImGuiTabBarFlags_FittingPolicyMixed, new default. (#3421, #8800) 2025-07-31 23:42:25 +09:00
ocornut
78d11cd781 Tabs: (Breaking) renamed ImGuiTabBarFlags_FittingPolicyResizeDown to ImGuiTabBarFlags_FittingPolicyShrink. (#261, #351) 
Amend 54a60aaa40
 2025-07-31 22:58:01 +09:00
ocornut
7278cda039 Tabs: added TabMinWidthBase, ImGuiStyleVar_TabMinWidthBase. 2025-07-31 22:57:11 +09:00
ocornut
34debc733f Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui.h
 2025-07-27 20:35:25 +09:00
Ori Avtalion
075ad676aa Demo: Fix '= =' typo in text (#8836) 2025-07-25 17:36:23 +09:00
ocornut
fe1cee0837 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
 2025-07-22 18:38:50 +09:00
ocornut
4d745bc602 Version 1.92.2 WIP 2025-07-10 18:41:05 +02:00
ocornut
44aa9a4b3a Merge branch 'master' into docking 
# Conflicts:
#	imgui_internal.h
 2025-07-09 18:55:12 +02:00
ocornut
5d4126876b Version 1.92.1 2025-07-09 18:53:58 +02:00
ocornut
92e2df5978 Merge branch 'master' into docking 2025-06-30 21:18:46 +02:00
ocornut
51b3495ad8 Fonts: set a maximum font size of 512.0f at ImGui:: API level to reduce edge cases. 2025-06-30 21:04:55 +02:00
ocornut
3ec62dfeff Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	imgui.h
 2025-06-27 16:59:03 +02:00
ocornut
0fe5166531 Demo: amend "Font Size" demo. (#8738) 2025-06-27 16:54:31 +02:00
Demonese
9fbe560218 Demo: Added "Widgets/Text/Different Size Text" section to show font system changes in v1.92. (#8738) 2025-06-27 16:54:31 +02:00
ocornut
47570d045d Docs: update Backends with direction for implementing RenderDrawData function and supporting ImGuiBackendFlags_RendererHasTextures. (#8735, #8465) 2025-06-27 15:03:10 +02:00
ocornut
f18aea5246 Version 1.92.1 WIP 2025-06-27 13:30:45 +02:00
ocornut
adfa5364cd Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
#	imgui.cpp
 2025-06-25 18:27:19 +02:00
ocornut
673eb7de96 Version 1.92.0 2025-06-25 18:19:56 +02:00
ocornut
da3c86925a Demo: added TextLinkOpenURL() call in Widgets section. 2025-06-25 18:19:56 +02:00
ocornut
7cd567202e Merge branch 'master' into docking 2025-06-24 15:17:29 +02:00
ocornut
6e846c56b4 Demo: fixed ID conflicts. (#8723) 2025-06-24 12:25:04 +02:00
ocornut
b580c11303 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl2.cpp
 2025-06-20 15:19:36 +02:00
ocornut
e97e55adbc Backends: Fixed various warnings discovered when using MinGW GCC 15/Clang on latest backends. 
dx12: 'ImGui_ImplDX12_Data* bd' shadowed local in spite of being in lambda.
 2025-06-20 15:18:00 +02:00
ocornut
7b8e000133 Fixed duplicate symbols in some compile-time configurations. 2025-06-12 11:28:35 +02:00
ocornut
1ce75e2bca Fixed duplicate symbols in some compile-time configurations. 2025-06-12 11:25:15 +02:00
ocornut
e8f831deaa Merge branch 'master' into docking 2025-06-12 11:07:42 +02:00
ocornut
a0b3eceec7 Fixed using IMGUI_DISABLE_DEMO_WINDOWS without IMGUI_DISABLE_DEBUG_TOOLS and without linking with imgui_demo.cpp 2025-06-12 11:02:32 +02:00
ocornut
6af6cec23f Merge branch 'master_fonts' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.h
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl2.h
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_opengl3.h
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdlgpu3.cpp
#	backends/imgui_impl_sdlgpu3.h
#	backends/imgui_impl_vulkan.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_sdl2_directx11/main.cpp
#	examples/example_sdl2_opengl2/main.cpp
#	examples/example_sdl2_opengl3/main.cpp
#	examples/example_sdl2_vulkan/main.cpp
#	examples/example_sdl3_opengl3/main.cpp
#	examples/example_sdl3_sdlgpu3/main.cpp
#	examples/example_sdl3_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
 2025-06-11 18:07:19 +02:00
ocornut
4acce85656 Fonts: tweaks demo and exposure to sliders, etc. 2025-06-11 17:36:28 +02:00
ocornut
d85e22d205 Added style.FontScaleDpi which is the field overwritten by ImGuiConfigFlags_DpiEnableScaleFonts. 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
 2025-06-11 16:09:56 +02:00
ocornut
8766efcba6 (Breaking) Renamed io.FontGlobalScale to style.FontScaleMain. 
# Conflicts:
#	imgui.cpp
 2025-06-11 16:07:21 +02:00
ocornut
80c08f2286 (Breaking) Fonts: obsoleting SetWindowFontScale(). 
+ Comments

# Conflicts:
#	imgui.cpp
 2025-06-11 16:07:05 +02:00
ocornut
1e118ab891 Fonts: added ImGuiStyle::FontSizeBase. Ensuring PushFontSize() works before main loop and across NewFrame(). 
# Conflicts:
#	imgui.cpp
 2025-06-11 16:06:21 +02:00
ocornut
0fff7ceda4 Fonts: comments, tweaks, minor amends. 
Comments, tweaks
 2025-06-11 15:53:42 +02:00
ocornut
735d31e54a Demo: Exposed some basic UI in demo for sanity. 2025-06-11 15:52:04 +02:00
ocornut
0b71339122 Demo: Add a "Fonts" section for visibility. 2025-06-11 15:51:33 +02:00
ocornut
722f6013ff Fonts: Added a bit of user facing tooling. 2025-06-11 15:45:14 +02:00
ocornut
0f0473bf1c Fonts, Textures: main code for ImGuiBackendFlags_RendererHasTextures feature. 
# Conflicts:
#	imgui.h
#	imgui_demo.cpp
 2025-06-11 15:03:46 +02:00
ocornut
191a728ecc (Breaking) added ImTextureRef struct. Changed ImDrawCmd::TextureId to TexRef. 
Softly breaking. May require support from language binding generator.
Rebased and reworked completely on 2025/03/19.
 2025-06-11 15:02:36 +02:00
ocornut
e55415bfef (Breaking) renamed/moved ImGuiConfigFlags_DpiEnableScaleFonts -> ioConfigDpiScaleFonts, ImGuiConfigFlags_DpiEnableScaleViewports -> io.ConfigDpiScaleViewports 2025-06-11 15:02:06 +02:00
ocornut
eaac68ca2c Merge branch 'master' into docking 
# Conflicts:
#	imgui_demo.cpp
 2025-06-04 22:30:43 +02:00
ocornut
c3d7ada9df Demo: add indentation to simplify upcoming merges. 2025-06-04 22:27:34 +02:00
ocornut
91f72bbe1c Demo: omit ImGui:: prefix from ShowStyleEditor(), ShowUserGuide() code. 2025-06-04 21:29:12 +02:00
ocornut
9485aeb5c8 Demo: changed default framed item width to use Min(GetFontSize() * 12, GetContentRegionAvail().x * 0.40f). 2025-06-04 17:35:45 +02:00
ocornut
2bf57bbad4 Refactor: move SetCurrentFont(), PushFont(), PopFont() to a section. 
+ Add commented out config flags.
 2025-05-27 18:31:55 +02:00
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
6d939fcedc (Breaking) TreeNode: renamed ImGuiTreeNodeFlags_NavLeftJumpsBackHere to ImGuiTreeNodeFlags_NavLeftJumpsToParent for clarity. (#1079, #8639) 2025-05-15 17:35:29 +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
ocornut
afd3a36f69 Demo: added basic Fonts section under main demo (same as Metrics one) for visibility. 2025-05-05 19:39:56 +02:00