mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-09-30 07:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,931 Commits 10 Branches 145 Tags
ab760992adb66258e65f78bb67380a00113e8996
Commit Graph

2730 Commits

Author SHA1 Message Date
ocornut
ab760992ad Merge branch 'master' into docking 2025-09-08 13:35:24 +02:00
ocornut
230418a75d InputText: Word-Wrap: attempt to track cursor while resizing frame/parent. (#3237, #952, #1062, #7363) 2025-09-08 11:56:22 +02:00
ocornut
a82f66a9b0 InputText: Word-Wrap: added ImGuiInputTextFlags_WordWrap support. (#3237, #952, #1062, #7363) 2025-09-08 11:56:20 +02:00
ocornut
e422a38e4c InputText: internals: expose LineCount, GetPreferredOffsetX(). 2025-09-08 11:54:34 +02:00
ocornut
11fff1ccf5 ImFont::RenderText() takes ImDrawTextFlags_CpuFineClip instead of bool cpu_fine_clip + forward ImDrawTextFlags to word-wrap code. 
(for #3237, #952, #1062, #7363)
 2025-09-08 11:54:33 +02:00
ocornut
56189cd814 Internals: added ImDrawTextFlags_StopOnNewLine support to ImFontCalcTextSizeEx(), ImDrawTextFlags_WrapKeepTrailingBlanks to ImTextCalcWordWrapNextLineStart(). 
(for #3237, #952, #1062, #7363)
 2025-09-08 11:54:33 +02:00
ocornut
bc6478f651 Internals: added ImDrawTextFlags_WrapKeepTrailingBlanks required for text-edit style word-wrapping. 
(for #3237, #952, #1062, #7363)
 2025-09-08 11:54:33 +02:00
ocornut
34ab6c8a89 Internals: extracted ImFont::CalcTextSizeA() into ImFontCalcTextSizeEx() so we can make change to its signature. 
(for #3237, #952, #1062, #7363)
 2025-09-08 11:54:33 +02:00
ocornut
c63b5bd8fb Internals: extracted ImFont::CalcWordWrapPosition() into ImFontCalcWordWrapPositionEx() so we can make change to its signature. 
(for #3237, #952, #1062, #7363)
 2025-09-08 11:54:33 +02:00
ocornut
8a35ce0e98 CalcWordWrapPosition() breaks on \n instead of relying on caller to do it + expose ImTextCalcWordWrapNextLineStart(). (#3237, #952, #1062, #7363) 
Should be functional no-op, fingers crossed. Breaking on \n allows caller to count lines reliably.
 2025-09-08 11:54:32 +02:00
fdsa
09ebcf1779 Docs: fixed mismatched parentheses & other small changes. (#8922) 2025-09-08 11:30:14 +02:00
ocornut
740c566305 Merge branch 'master' into docking 2025-09-02 16:10:59 +02:00
ocornut
771fae623d ImRect: added AsVec4() helper. Using ImRect in InputTextEx(). 2025-08-27 21:43:25 +02:00
ocornut
4d216d4510 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
 2025-08-27 18:57:56 +02:00
Christian Fillion
a309d2dcac Fonts: fixed assertion failure when ImFontAtlasRectEntry::Generation overflows. (#8906) 2025-08-27 14:39:08 +02:00
ocornut
75a4a48d1f Internals: extracted ImHashSkipUncontributingPrefix() out of CreateNewWindowSettings() and added note about it. 2025-08-26 16:23:06 +02:00
ocornut
9e864012ae Debug Tools: ID Stack Tool: added option to hex-encode non-ASCII characters in output path. (#8904, #4631) 2025-08-26 15:58:59 +02:00
ocornut
783f1e62cc Debug Tools: ID Stack Tool: fixed using fixed-size buffers preventing long identifiers from being displayed in the tool. (#8905, #4631) 2025-08-26 15:36:56 +02:00
ocornut
4ebfe1cba5 Merge branch 'master' into docking 2025-08-20 18:28:39 +02:00
ocornut
321e9eb919 Fixes for printing out ImTextureID value when it is typedef to other types. (#8889) 2025-08-19 15:32:12 +02:00
ocornut
86ec5c8342 Version 1.92.3 WIP 2025-08-19 15:15:49 +02:00
ocornut
160e3683ab Merge branch 'master' into docking 2025-08-13 17:31:15 +02:00
ocornut
45acd5e0e8 Version 1.92.2b 2025-08-13 17:31:01 +02:00
ocornut
774ddb58bd Fixed IsItemHovered() failing on disabled items and items that have no identifier. Made holding on disabled items not leak IsItemDisabled() between disabled items when window has _NoMove. (#8877, #8883) 
See amends to "widgets_status_common", "widgets_disabled_2" tests.
 2025-08-13 17:08:04 +02:00
ocornut
4dee11a089 Make ImGuiInputSource int. 
(primarily to avoid "result of comparison 'ImGuiInputSource' < 0 is always false" in GetInputSourceName().
 2025-08-13 17:02:23 +02:00
ocornut
af920e1e6f Version 1.92.3 WIP 2025-08-12 11:30:41 +02:00
ocornut
031a18c417 Merge branch 'master' into docking 2025-08-11 16:47:16 +02:00
ocornut
2b24f5fa71 Version 1.92.2 2025-08-11 16:47:06 +02:00
ocornut
cbf9e3f554 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlgpu3.cpp
#	imgui.cpp
 2025-08-08 15:51:56 +02:00
ocornut
7d5fef8642 Nav: fixed a bug where GamepadMenu couldn't toggle between main and menu layer while navigating a Modal window. (#8834) 
Amend 901d432cb but for Gamepad.
 2025-08-04 15:06:14 +09:00
ocornut
23c9362550 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2025-07-31 23:44:44 +09:00
ocornut
320c94bfaa Tabs: when scrolling is enabled, track selected tabs when resizing down parent container. (#3421, #8800) 2025-07-31 23:42:30 +09:00
ocornut
3ef6c8410a Tabs: added new fitting policy ImGuiTabBarFlags_FittingPolicyMixed, new default. (#3421, #8800) 2025-07-31 23:42:25 +09:00
ocornut
7278cda039 Tabs: added TabMinWidthBase, ImGuiStyleVar_TabMinWidthBase. 2025-07-31 22:57:11 +09:00
ocornut
2ab3946ecb Windows: add StopMouseMovingWindow(), partial merge 80d78fa from docking. 2025-07-30 18:46:49 +09:00
ocornut
80d78fad7c Windows, Viewport: fixed an issue where interrupting a viewport move with e.g. a ClearActiveID() call would leave the dragged viewport with the ImGuiViewportFlags_NoInputs flag. 
Amend 6b7766817, 36055213c5, #5324.
Next would be good to amend the ImGuiViewportFlags_NoInputs clear to match the set logic.
 2025-07-30 18:41:36 +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
gomkyung2
9c392896b7 Misc: removed more redundant inline static linkage from imgui_internal.h. (#8813, #8682, #8358) 2025-07-22 16:31:10 +09:00
ocornut
ed5bd1f9ef Changed ImTextCharToUtf8() to return bytes count rather than original pointer. (#8820) 
Amend c2bf4abfa1
 2025-07-22 14:17:11 +09:00
ocornut
a0d3e405a3 Textures: ImTextureData::Create() sets status. RegisterUserTexture() increases RefCount. Added comments about ImTextureData::GetTexRef(). (#8789) 2025-07-11 16:49:28 +02:00
ocornut
0e6e876f23 Docs: update docs/comments about ImTextureRef, ImTextureID. (#8783) 2025-07-10 19:07:28 +02: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
0ba02a4ed6 Debug Tools: added IMGUI_DEBUG_HIGHLIGHT_ALL_ID_CONFLICTS. (#8651, #7961, #7669) 2025-07-09 18:45:58 +02:00
ocornut
f39b138487 Internals: rename DebugDrawIdConflicts -> DebugDrawIdConflictsId. 2025-07-09 18:24:14 +02:00
ocornut
d9b758661f Misc comments to facilitate update for people who nilly-willy copied entire chunks of internal widgets to create their own. 2025-07-09 16:30:53 +02:00
ocornut
92e2df5978 Merge branch 'master' into docking 2025-06-30 21:18:46 +02:00
ocornut
fd75bdccb0 Fonts: for large size fonts, layout/size calculation only load glyphs metrics. Actual glyphs are renderer+packed when used by drawing functions. (#8758, #8465) 
(Breaking) breaks signature of ImFontLoader::FontBakedLoadGlyph, sorry.
 2025-06-30 21:16:20 +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