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
4dc9df6aae
Tables: fixed an issue where Columns Visible/Hidden state wouldn't be correctly overridden when hot-reloading .ini state. ( #7934 )
2025-02-10 19:29:18 +01:00
ocornut
50dbb086f2
Tables: sneakily honor ImGuiNextWindowDataFlags_HasChildFlags/ImGuiNextWindowDataFlags_HasWindowFlags as a way to facilitate various hacks/workarounds.
2025-02-07 22:57:15 +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 3c7177c659f3c4fc2ae7f833c6
2025-02-07 18:16:04 +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
f820bf7cd4
Version 1.91.9 WIP
2025-02-03 12:33:40 +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
082595200d
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2025-01-29 20:04:45 +01:00
ocornut
dfd1bc3c5b
Tables, Menus: Fixed using BeginTable() in menu layer (any menu bar). ( #8355 )
2025-01-29 19:05:18 +01:00
ocornut
4230e98720
Error Handling, Debug Log: IMGUI_DEBUG_LOG_ERROR() doesn't need the extra variable.
...
Amend 236006152
2025-01-28 14:39:10 +01:00
ocornut
ea0da0bf47
Extracted PushPasswordFont() out of InputText code.
2025-01-27 18:04:44 +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
9c4948a4d1
TabBar: Internals: added TabItemSpacing(). ( #8349 , #3291 )
2025-01-27 15:41:24 +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
64e738cae7
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2025-01-22 12:19:09 +01:00
David Maas
2af26b75d1
ColorEdit, ColorPicker: Fixed alpha preview broken in 1.91.7. ( #8336 , #8241 ). [@PathogenDavid]
...
ImAlphaBlendColors() was broken by ImLerp() change. (cd6c83c
2025-01-21 14:26:00 +01:00
ocornut
6e94f6cefb
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# imgui.cpp
# imgui_internal.h
2025-01-20 18:04:31 +01:00
ocornut
f2262eb81a
Windows: latch FontRefSize at time of Begin(), consistent with e.g. TitleBarHeight, and to avoid calling CalcFontSize() on non-current window.
2025-01-16 19:46:54 +01:00
ocornut
b7c27c5333
Windows: legacy SetWindowFontScale() is properly inherited by nested child windows. ( #2701 , #8138 , #1018 )
2025-01-16 19:08:39 +01:00
ocornut
015186aaf8
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_vulkan.cpp
2025-01-15 17:34:17 +01:00
ocornut
0e21bde77b
Misc shallow merge to reduce diff in other branches.
2025-01-15 14:00:03 +01:00
ocornut
c59a2267d0
Version 1.91.8 WIP
2025-01-15 11:58:47 +01:00
ocornut
c0ae3258f9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2025-01-14 13:46:39 +01:00
ocornut
5c1d2d1e4c
Version 1.91.7
2025-01-14 13:29:25 +01:00
ocornut
d0d571e0d7
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
# imgui_internal.h
2025-01-13 14:30:57 +01:00
ocornut
a604d4f717
Fixed IsItemDeactivated(), IsItemDeactivatedAfterEdit() to work when interrupted before/after the active id is submitted. ( #5184 , #5904 , #6766 , #8303 , #8004 )
2025-01-13 14:09:41 +01:00
ocornut
a28ffa81c4
Docs: added more references to IsKeyDown(), InFlags. ( #8317 )
2025-01-13 13:35:26 +01:00
ocornut
9cc0bf89bd
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
2025-01-06 17:59:22 +01:00
ocornut
80aafbc81b
Data types: moved ImGuiDataType_String to public API as a convenience enum value only. ( #8266 )
2025-01-06 14:22:03 +01:00
ocornut
c147a59bb0
Clarified alternative for ImGuiButtonFlags_Repeat being ImGuiItemFlags_ButtonRepeat. ( #8293 )
2025-01-06 13:58:02 +01:00
ocornut
5413a9a6b4
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_dx12.cpp
# imgui.cpp
# imgui_internal.h
2024-12-20 23:31:52 +01:00
ocornut
18929bd6d6
Internals: merge ScaleWindowsInViewport() from docking branch.
2024-12-20 23:26:21 +01:00
ocornut
eed9502795
Error Handling: Fixed bugs recovering from within a table that created a child window, and from nested child windows. ( #1651 )
2024-12-20 14:28:04 +01:00
Raffaello Bertini
cd6c83cdcc
Fixes GCC warnings ( #8241 )
2024-12-18 17:58:19 +01:00
ocornut
edef72d497
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_vulkan.cpp
2024-12-18 17:02:08 +01:00
ocornut
32f11402f9
InputText: use TextSrc more consistently to facilitate accessing user buffer in text processing code. ( #8242 )
...
Followup to e900571abd07f6d#7925 )
2024-12-18 16:53:38 +01:00
ocornut
324d4bb140
InputText: calling ReloadUserBuf doesn't clear undo stack. ( #2890 )
2024-12-12 19:03:09 +01:00
ocornut
8237ab450e
Drags, Sliders: store initial value on activation, as a convenience for some mods. ( #8223 )
2024-12-12 18:52:07 +01:00
ocornut
f9f4e22f6f
InputText: some tidying up. ( #7925 )
2024-12-12 18:30:57 +01:00
ocornut
f25665f360
Version 1.91.7 WIP
2024-12-11 15:37:16 +01:00
ocornut
947aa9c972
Merge branch 'master' into docking
2024-12-11 15:08:31 +01:00
