1
0
mirror of https://github.com/ocornut/imgui.git synced 2025-03-03 16:53:46 +01:00

5983 Commits

Author SHA1 Message Date
ocornut
15b96fd051 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2025-02-27 22:01:51 +01:00
ocornut
482a1f50b6 Internals: rename ImGuiDataVarInfo to ImGuiStyleVarInfo. Move ImGuiStyleMod, ImGuiColorMod to own section.
# Conflicts:
#	imgui.cpp
2025-02-27 21:51:07 +01:00
ocornut
494ea57b65 Image: removed 'tint_col', 'border_col' parameters from Image(). Added ImageWithBg(). Added style.ImageBorderSize, ImGuiStyleVar_ImageBorderSize. (#8131, #8238)
Displaying a black background behind Font Atlas texture.
2025-02-27 21:48:24 +01:00
ocornut
3fb14b50f8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
2025-02-26 21:08:45 +01:00
ocornut
4c0604ec2e Font: shallow refactor, rename ConfigData[] fields to Sources[], ConfigDataCount to SourcesCount.
In theory this is all internal stuff.
2025-02-25 17:41:29 +01:00
ocornut
030746faff Debug Tools: Added io.ConfigDebugHighlightIdConflictsShowItemPicker. (#7961, #7669) 2025-02-24 17:45:16 +01:00
ocornut
edc66d79c7 Nav: extract code into a NavUpdateWindowingApplyFocus() so it may be reused elsewhere. 2025-02-21 23:11:11 +01:00
ocornut
773060155f Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
2025-02-21 19:56:20 +01:00
ocornut
434b7710f3 Internals: packing ImGuiDataVarInfo + misc renaming + value of ImGuiDataType_Pointer doesn't need to be Count+1 2025-02-21 19:26:24 +01:00
ocornut
6dc376f676 ImFontAtlas: added software/drawlist version of ImGuiMouseCursor_Wait/ImGuiMouseCursor_Progress + moved GetMouseCursorTexData() to internals. 2025-02-20 12:17:21 +01:00
ocornut
afd659bb92 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_vulkan.cpp
2025-02-17 11:46:16 +01:00
ocornut
78ec1272e9 ImDrawList: added InitialFringeScale in ImDrawListSharedData. Default to 1.0f.
This is to allow some DPI mods with less changes. Only the initial value in SetupDrawListSharedData() will need change.
2025-02-17 11:28:35 +01:00
ocornut
a4ebe3d576 Viewports: Fixed assertion when multi-viewports disabled and no monitor submitted. Reworked 95c4111. (#8401, #8393, #8385) 2025-02-14 12:04:05 +01:00
Gabriel Rodriguez
95c4111783 Viewports: default to first monitor is viewport is outside bounds. (#8393, #8385)
Before the assert was introduced in d66f4e589 the viewport would be eventually clamped with ClampWindowPos using g.FallbackMonitor, but code would run temporarly with DpiScale=0.
2025-02-13 15:01:54 +01:00
ocornut
71d39a4634 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui.cpp
#	imgui_internal.h
2025-02-12 19:17:48 +01:00
ocornut
a931fb7f51 Fixed static analyzer warning.
(was harmless as initialized in NewFrame)
2025-02-12 19:15:00 +01:00
ocornut
7221f5e739 Styles, Tabs: Fixed ef7ffaf. (#8387) 2025-02-12 19:01:02 +01:00
ocornut
ef7ffaff74 Styles, Tabs: (Breaking) Renamed TabMinWidthForCloseButton to TabCloseButtonMinWidthUnselected. Added TabCloseButtonMinWidthSelected. (#8387) 2025-02-12 15:46:17 +01:00
fdsa
6916f935eb InputText: Allow CTRL+Shift+Z to redo even outside of OSX. (#8389) 2025-02-12 14:25:38 +01:00
ocornut
3b2f2602b4 Windows: Fixed an issue where BeginChild() inside a collapsed Begin() wouldn't inherit the SkipItems flag.
Amend/fix a89f05a10 (old!)
Discovered while looking at glyph being processed in WIP branch.
2025-02-10 21:34:55 +01:00
ocornut
88cda0cab6 Fixed minor warning. Added comment. 2025-02-10 12:39:54 +01:00
ocornut
a18622c369 TextLinkOpenURL(): fixed default Win32 io.PlatformOpenInShellFn handler to handle UTF-8 regardless of system regional settings. (#7660) 2025-02-10 12:02:01 +01:00
ocornut
e5668b8c73 Internals: rename ImGuiNextWindowData::Flags to HasFlags for consistency and to reduce mistakes. 2025-02-07 22:48:31 +01:00
ocornut
8679cfa2d8 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
#	imgui.cpp
2025-02-07 18:27:32 +01:00
ocornut
4982602f6f Windows, Style: Added style.WindowBorderHoverPadding setting to configure inner/outer padding applied to hit-testing of windows borders.
Amend 3c7177c6, 59f3c4fc2, ae7f833c6.
Could be latched inside windows to be multi-dpi friendly, but likely won't matter soon.
2025-02-07 18:16:04 +01:00
ocornut
cfed18afc7 Add ImFontConfig::GlyphExtraAdvanceX as a replacement for GlyphExtraSpacing.x (#242)
Partly restore 1a31e31.
2025-02-06 12:34:37 +01:00
ocornut
d80347613a Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_metal.mm
#	imgui.cpp
#	imgui_internal.h
2025-02-03 18:42:24 +01:00
ocornut
1a31e31ae9 (Breaking) Fonts: removed ImFontConfig::GlyphExtraSpacing option which seems largely obsolete and unused. (#242) 2025-02-03 17:55:35 +01:00
ocornut
5dd84082ab InputTextWithHint(): Fixed buffer overflow when user callback modifies the buffer contents in a way that alters hint visibility. (#8368) 2025-02-03 15:11:22 +01:00
ocornut
6265339995 Fixed IsItemDeactivatedAfterEdit() signal being broken for Checkbox(), RadioButton(), Selectable(). (#8370)
Item is already made inactive at the time of calling MarkItemEdited().
Fix a604d4f71
2025-02-03 14:03:43 +01:00
ocornut
f820bf7cd4 Version 1.91.9 WIP 2025-02-03 12:33:40 +01:00
ocornut
e4db4e423d Internals: renamed GetIOEx() to GetIO(). Added GetPlatformIO() explicit context variant. - OOPS 2025-01-31 19:50:18 +01:00
ocornut
e2a99b5760 Internals: renamed GetIOEx() to GetIO(). Added GetPlatformIO() explicit context variant. 2025-01-31 18:28:31 +01:00
ocornut
11b3a7c8ca Merge branch 'master' into docking 2025-01-31 16:10:20 +01:00
ocornut
dbb5eeaadf Version 1.91.8 2025-01-31 16:08:17 +01:00
ocornut
fa178f4235 Error Handling: Recovery from missing EndMenuBar() call. (#1651) 2025-01-30 14:30:14 +01:00
ocornut
082595200d Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
2025-01-29 20:04:45 +01:00
ocornut
dabc990189 Rename internal id for standardizing naming convention. "##menubar" -> "##MenuBar", "###NavWindowingList" -> "###NavWindowingOverlay"
"###NavUpdateWindowing" one should have zero side effect on anyone.
2025-01-29 19:59:41 +01:00
ocornut
75d99659c4 Docking: move DockTabItemStatusFlags stuff next to its peers in DC structure. 2025-01-27 15:48:20 +01:00
ocornut
db4e541306 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
2025-01-27 15:45:26 +01:00
ocornut
a05d547ae8 Windows: separating WindowItemStatusFlags from ChildItemStatusFlag, because IsItemXXX _after_ BeginChild()>Begin() shouldn't return last status emitted by e.g. EndChild()
As IsItemXXX() after is specced as returning title bar data we don't want to lock ourselves up from adding them to child window (e.g. MDI idea using windows to host child windows).
2025-01-27 14:39:26 +01:00
ocornut
134fbe1245 Windows: Fixed IsItemXXXX() functions not working on append-version of EndChild(). (#8350)
Also made some of the fields accessible after BeginChild() to match Begin() logic.
2025-01-27 12:41:31 +01:00
ocornut
5a28f188ff Fixed parameter names to SetLastItemData() to align with current names. 2025-01-27 12:27:15 +01:00
ocornut
355cb589e3 Merge branch 'master' into docking, incl conflict merge in BeginMenuBar() for #8267
# Conflicts:
#	imgui_widgets.cpp
2025-01-24 19:40:54 +01:00
ocornut
8a1613a382 Fonts: OversampleH/OversampleV value defaults to 0 for automatic selection. 2025-01-24 19:32:30 +01:00
ocornut
53244aaac7 Amend 9bc5b04 with a shadowed variable warning fix. 2025-01-24 15:00:21 +01:00
ocornut
9bc5b0406d Windows, Style: Fixed small rendering issues with menu bar, resize grip and scrollbar when using thick border sizes. (#8267, #7887)
Amend e.g. 742b5f4c.
2025-01-24 14:39:07 +01:00
ocornut
71da34c48c Debug Tools: Tweaked font preview + indent "Glyphs" block. 2025-01-22 16:56:18 +01:00
ocornut
64e738cae7 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
2025-01-22 12:19:09 +01:00
ocornut
6906ac979e ColorEdit, ColorPicker: (Breaking) redesigned how alpha is displayed in the preview square. (#8335, #1578, #346)
Added ImGuiColorEditFlags_AlphaOpaque, ImGuiColorEditFlags_AlphaNoBg.
Removed ImGuiColorEditFlags_AlphaPreview.
2025-01-22 12:12:07 +01:00