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 e900571
Removed SetClipboardText() trick used in abd07f6d (#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 |
|
ocornut
|
993fa34749
|
Version 1.91.6
|
2024-12-11 15:05:36 +01:00 |
|
ocornut
|
a9cd0f5e42
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_allegro5.cpp
# backends/imgui_impl_allegro5.h
# backends/imgui_impl_android.cpp
# backends/imgui_impl_android.h
# backends/imgui_impl_dx10.cpp
# backends/imgui_impl_dx10.h
# backends/imgui_impl_dx12.cpp
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_glfw.h
# 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_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# backends/imgui_impl_vulkan.cpp
# backends/imgui_impl_vulkan.h
# backends/imgui_impl_win32.cpp
# backends/imgui_impl_win32.h
# imgui.cpp
|
2024-12-11 12:27:25 +01:00 |
|
ocornut
|
c3ffd4c53e
|
Misc: Added IMGUI_USE_LEGACY_CRC32_ADLER to use old tables. (#8169, #4933)
|
2024-12-11 12:13:28 +01:00 |
|
ocornut
|
fce07bb1cb
|
Don't enable SSE4 under Emscripten - Fix. (#8213, #8169, #4933)
|
2024-12-09 12:43:49 +01:00 |
|
slowriot
|
2671f68f7f
|
Don't enable SSE4 under Emscripten (#8213, #8169, #4933)
Amend 326dc95f9
|
2024-12-09 12:14:43 +01:00 |
|
ocornut
|
3f3c62a3c9
|
ScrollbarEx: clarify use of flags and make them optional. (#8215)
|
2024-12-09 11:43:00 +01:00 |
|
ocornut
|
ff2d6815ef
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx9.cpp
# backends/imgui_impl_dx9.h
# backends/imgui_impl_vulkan.cpp
# imgui.cpp
|
2024-12-04 19:56:35 +01:00 |
|
Teselka
|
326dc95f9c
|
Misc: use native crc32 instructions on SEE 4.2 targets. (#8169, #4933)
|
2024-11-27 12:23:27 +01:00 |
|
ocornut
|
14d213ca85
|
Docking: Added an assert to clarify that ImGuiDockNodeFlags_CentralNode flag does not need to be passed to DockSpace(). (#8145)
|
2024-11-26 14:05:52 +01:00 |
|
ocornut
|
dad1047b04
|
Backends: Win32: Fixed a crash when multiple processes are running with multi-viewports, caused by misusage of GetProp(). (#8162, #8069)
Amend fedf45c77
|
2024-11-21 15:01:21 +01:00 |
|
ocornut
|
cdf21f6773
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_dx12.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2024-11-21 14:52:04 +01:00 |
|
ocornut
|
20360e00ce
|
Merge miscellaneous small changes to reduce drift with texture update branch.
- ImGuiDebugLogFlags_EventFont is yet unused.
|
2024-11-20 21:46:47 +01:00 |
|
ocornut
|
3381ab423b
|
Version 1.91.6 WIP + fixed typo in tooltip.
|
2024-11-12 11:56:21 +01:00 |
|
ocornut
|
368123ab06
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui_draw.cpp
|
2024-11-07 19:58:23 +01:00 |
|
ocornut
|
f401021d5a
|
Version 1.91.5
|
2024-11-07 19:57:33 +01:00 |
|
ocornut
|
01d27a4acd
|
Internals: added IM_LIKELY(), IM_UNLIKELY() helper macros (yet unused). Added ImFontGetCharAdvanceX() macro.
|
2024-11-07 19:33:25 +01:00 |
|
ocornut
|
83660e37e3
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glut.cpp
# backends/imgui_impl_glut.h
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_demo.cpp
|
2024-11-06 17:58:35 +01:00 |
|
ocornut
|
63234f8dd0
|
InputText: Internals: rename CurLenA->TextLen, InitialTextA->TextToRevertTo.
Follow the refactors in #7925.
|
2024-11-05 11:32:02 +01:00 |
|
ocornut
|
be2d006e2e
|
Align warning blocks. Removed -Wunused-function, -Wmissing-prototypes from imgui_internal.h
As supposedly they were for stb_textedit.h which is now moved to imgui_draw.cpp
|
2024-11-05 10:50:49 +01:00 |
|
Maya Warrier
|
88e232739b
|
Ignore clang warning Wnontrivial-memaccess (#8129)
Produced when memset(this, ..) is used on a non-trivially copyable type
|
2024-11-05 10:44:39 +01:00 |
|
ocornut
|
75f83de52a
|
InputText: fixed a bug (regression in 1.91.2) where modifying text buffer within a callback would sometimes prevents further appending to the buffer. (#7925)
There's a confusion between TextA.Size and CurLenA we should be merging them.
Amend 19accb14a
|
2024-11-04 20:22:10 +01:00 |
|