ocornut
|
10a5a857f5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
# imgui.h
|
2024-06-26 14:54:01 +02:00 |
|
ocornut
|
32f9dfc126
|
Viewports: Backported 'void* ImGuiViewport::PlatformHandle' from docking branch for use by backends.
|
2024-06-26 14:32:48 +02:00 |
|
ocornut
|
7237d3e5c3
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2024-06-21 16:18:22 -07:00 |
|
cfillion
|
755bf2b8c2
|
(Breaking) Move ImGuiWindowFlags_NavFlattened to ImGuiChildFlags_NavFlattened. (#7687)
|
2024-06-21 16:00:57 -07:00 |
|
ocornut
|
e3971079cf
|
IO: added ImGuiConfigFlags_NoKeyboard for consistency and convenience. (#4921)
# Conflicts:
# imgui.h
# imgui_demo.cpp
|
2024-06-21 10:17:44 -07:00 |
|
ocornut
|
8067d05f74
|
IO: added ClearInputMouse(). made ClearInputKeys() not clear mouse data. (#4921)
Amend 6aa408c6a
|
2024-06-21 10:16:54 -07:00 |
|
ocornut
|
e863f89d39
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-06-20 17:47:22 -07:00 |
|
ocornut
|
77d9f80754
|
Drag and Drop: Added ImGuiDragDropFlags_PayloadNoCrossContext and ImGuiDragDropFlags_PayloadNoCrossProcess flags.
|
2024-06-20 11:37:10 -07:00 |
|
ocornut
|
8c318dc770
|
Drag and Drop: (Breaking) renamed ImGuiDragDropFlags_SourceAutoExpirePayload to ImGuiDragDropFlags_PayloadAutoExpire. (#1725, #143)
|
2024-06-20 11:36:45 -07:00 |
|
ocornut
|
3e7f1d42db
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
# imgui_draw.cpp
|
2024-06-18 17:45:17 -07:00 |
|
ocornut
|
21bda2ed99
|
TabBar, Style: added ImGuiTabBarFlags_DrawSelectedOverline and ImGuiCol_TabSelectedOverline, ImGuiCol_TabDimmedSelectedOverline.
|
2024-06-18 17:41:43 -07:00 |
|
ocornut
|
1b9593e889
|
Style: (Breaking) renamed ImGuiCol_TabActive -> ImGuiCol_TabSelected, ImGuiCol_TabUnfocused -> ImGuiCol_TabDimmed, ImGuiCol_TabUnfocusedActive -> ImGuiCol_TabDimmedSelected.
Amend #261, #351
|
2024-06-18 17:37:29 -07:00 |
|
ocornut
|
22d65c7949
|
Removed old nested structure: renaming ImGuiStorage::ImGuiStoragePair type to ImGuiStoragePair (simpler for many languages).
|
2024-06-10 19:33:06 +02:00 |
|
ocornut
|
7260bb51cf
|
Version 1.90.9 WIP
|
2024-06-07 16:57:01 +02:00 |
|
ocornut
|
6d948ab47e
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-06-06 17:52:55 +02:00 |
|
ocornut
|
6f7b5d0ee2
|
Version 1.90.8
|
2024-06-06 17:45:40 +02:00 |
|
ocornut
|
67d886fd63
|
Removed ImGuiButtonFlags_MouseButtonDefault_.
|
2024-06-06 17:25:16 +02:00 |
|
ocornut
|
2a418f054d
|
InputText: reordered all flags. (ABI breaking)
|
2024-06-06 17:23:56 +02:00 |
|
ocornut
|
47db0698d2
|
InputScalar, InputInt, InputFloat: added ImGuiInputTextFlags_ParseEmptyRefVal, ImGuiInputTextFlags_DisplayEmptyRefVal. (#7305)
|
2024-06-06 16:51:15 +02:00 |
|
korenkonder
|
209edcc247
|
Fixed incorrect order of arguments in IsMouseClicked(). (#7657, #456)
Amend 85513de24
|
2024-06-04 17:29:59 +02:00 |
|
ocornut
|
fdc084f532
|
Merge branch 'master' into docking
|
2024-06-03 19:08:37 +02:00 |
|
ocornut
|
6cefd4fd88
|
Scrollbar: fixed miscalculation of vertical scrollbar visibility when required solely by the presence of an horizontal scrollbar. (#1574)
Initially fixed by 2d9d7a10c , and broken back by a0994d74c2 (v1.71, wow).
|
2024-06-03 16:41:29 +02:00 |
|
ocornut
|
f953ebf9ca
|
Disabled: nested tooltips or other non-child window within a BeginDisabled() block disable the disabled state. (#211, #7640)
|
2024-05-31 18:13:25 +02:00 |
|
ocornut
|
868f444620
|
Debug: extracted debug log 0xXXXXXXX scanning into a helper function. (#5855)
|
2024-05-29 18:48:25 +02:00 |
|
ocornut
|
51823d117d
|
Misc: made ImGuiDir, ImGuiSortDirection, ImGuiMouseCursor stronger-typed enums + cater for possible warning in backends's switch()
Not making ImGuiMouseCursor one because of warnings for non-explicitly handled value (case default: is not enough).
|
2024-05-28 18:09:41 +02:00 |
|
ocornut
|
222dd775fc
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2024-05-28 17:11:57 +02:00 |
|
ocornut
|
479c5f62fc
|
Style: make DisplayWindowPadding visible in style editor.
|
2024-05-28 15:47:19 +02:00 |
|
ocornut
|
1f9fc382c3
|
Version 1.90.8 WIP
Tidying up todo.txt
|
2024-05-28 10:09:31 +02:00 |
|
ocornut
|
2db79d0868
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-05-27 15:47:30 +02:00 |
|
ocornut
|
00ad3c65bc
|
Version 1.90.7
|
2024-05-27 15:47:04 +02:00 |
|
ocornut
|
f814ef816f
|
Commented out CaptureKeyboardFromApp(), CaptureMouseFromApp(). Commented out obsolete IsKeyPressedMap() from imgui_internal.h (can call IsKeyPressed). Comments
|
2024-05-27 14:41:02 +02:00 |
|
Christian Fillion
|
b9084949bd
|
Fixed typo in IsMouseDragging and GetMouseDragDelta's documentation. (#7620)
|
2024-05-25 14:36:48 +02:00 |
|
ocornut
|
fee0210592
|
Merge branch 'master' into docking
|
2024-05-24 16:09:29 +02:00 |
|
ocornut
|
ce4e210dcb
|
Shotcuts: renamed ImGuiInputFlags_RouteGlobalOverFocused -> ImGuiInputFlags_RouteOverFocused, ImGuiInputFlags_RouteGlobalOverActive -> ImGuiInputFlags_RouteOverActive in previsiion of using them with a Hovered route. (#456)
|
2024-05-24 16:07:58 +02:00 |
|
ocornut
|
5ce3d29955
|
Shortcuts: rename ImGuiInputFlags_RouteGlobalHighest to ImGuiInputFlags_RouteGlobalOverActive, made ImGuiInputFlags_RouteGlobalOverFocused and ImGuiInputFlags_RouteGlobalOverActive flags. (#456)
|
2024-05-24 15:44:59 +02:00 |
|
ocornut
|
650cb51bf1
|
Shortcuts: renamed ImGuiInputFlags_RouteActiveItem to ImGuiInputFlags_RouteActive. (#456, #7618)
Amend ef9d525
|
2024-05-24 15:27:48 +02:00 |
|
ocornut
|
ef9d525f02
|
Shortcuts: added ImGuiInputFlags_RouteActiveItem. (#456, #7618) + rearrange Changelog
|
2024-05-24 15:07:43 +02:00 |
|
ocornut
|
29439bdd27
|
Windows: BeginChild(): fixed auto-fit calculation when using either (not both) ResizeX/ResizeY and double-clicking on a border. (#1710)
Calculation incorrectly didn't always account for scrollbar as it assumed the other axis would also be auto-fit.
|
2024-05-24 12:31:40 +02:00 |
|
ocornut
|
5ecef2f321
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
|
2024-05-23 17:25:02 +02:00 |
|
ocornut
|
d5a600e9c6
|
Shortcuts, SetShortcutRouting: added ImGuiInputFlags_RouteFromRootWindow. Made it possible for SetShortcutRouting() to query for another location.
|
2024-05-23 17:22:44 +02:00 |
|
ocornut
|
c06e6340cd
|
Shortcuts: added ImGuiInputFlags_Tooltip. (#456)
|
2024-05-23 16:58:14 +02:00 |
|
ocornut
|
77e4171894
|
Shortcuts: added flags to SetNextItemShortcut(). (#456)
|
2024-05-23 16:57:19 +02:00 |
|
ocornut
|
fc512a2474
|
Inputs: Added Shortcut(), SetNextItemShortcut(). Added ImGuiInputFlags, ImGuiInputFlags_RouteXXXX. (#456, #2637)
|
2024-05-23 16:57:03 +02:00 |
|
ocornut
|
55748cdbe1
|
Internals, Inputs: *Breaking* Renamed ImGuiKeyOwner_None to ImGuiKeyOwner_NoOwner: avoid confusion with non zero value, makes IsKeyPressed() calls using ImGuiKeyOwner_NoOwner more explicit.
Amend 4448d975 (#456, #2637, #2620, #2891, #3370, #4828, #5108, #5242, #5641)
|
2024-05-23 16:57:03 +02:00 |
|
ocornut
|
36ffdd69d3
|
Merge remote-tracking branch 'origin/master' into docking
|
2024-05-21 19:01:06 +02:00 |
|
ocornut
|
9ebab255d2
|
Docking: *BREAKING* changed signature of DockSpaceOverViewport() to allow passing an explicit dockspace id if desired. (#7611)
|
2024-05-21 19:00:25 +02:00 |
|
ocornut
|
28a283b460
|
Windows: BeginChild(), Tables:fixed visibility of fully clipped child windows and tables to Test Engine.
|
2024-05-21 11:06:40 +02:00 |
|
ocornut
|
25e279ee73
|
Inputs: Treat ctrl-left-click as right click when ConfigMacOSXBehaviors is set. (#2343)
|
2024-05-17 15:26:34 +02:00 |
|
ocornut
|
b39fc84f89
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2024-05-16 19:57:04 +02:00 |
|
ocornut
|
7747106647
|
Inputs: swap Ctrl and Cmd on macOS X, remove ImGuiMod_Shortcut. (#2343, #4084, #5923, #456)
|
2024-05-16 19:16:55 +02:00 |
|