mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-12 20:19:02 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
8,591 Commits 9 Branches 127 Tags 417 MiB
031148dc56
Commit Graph

5201 Commits

Author SHA1 Message Date
ocornut
594cc4793a Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2023-04-25 12:21:16 +02:00
ocornut
b47507951e Nav: Fixed CTRL+Tab into a root window with only childs with _NavFlattened flags erroneously initializing default nav layer to menu layer. 2023-04-24 21:00:00 +02:00
ocornut
eed7b0e9c5 Nav: remove other-axis clamping, now that columns themselves are clamped. (#2221) 
Amend 00d3f92 + older f2d14724, 0cc20fca8
+ Add ImGuiNavMoveFlags_WrapMask_ for good measure.
 2023-04-24 20:04:05 +02:00
ocornut
da3d7e1587 Focus: added an early out in FocusWindow() for the common case. 2023-04-24 12:18:55 +02:00
ocornut
d2291df551 Viewports: Fixed setting focus from platform decoration from accidentally closing modals (#6299, #6357) 
+ Fixed double-assignment static analyzer warning.

# Conflicts:
#	imgui.cpp
 2023-04-21 19:22:41 +02:00
ocornut
bba39762dc Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2023-04-21 19:12:11 +02:00
ocornut
4d42450a73 Focus: amend ImGuiFocusRequestFlags_UnlessBelowModal to bring to front-most below the modal, simplify code in Begin(). (#6357, #4317) 2023-04-21 19:07:45 +02:00
ocornut
01ca196530 Focus: move focused child restore code in FocusWindow() with ImGuiFocusRequestFlags_RestoreFocusedChild flag. (#6357) 
# Conflicts:
#	imgui.cpp
 2023-04-21 19:07:08 +02:00
ocornut
30eceaf95f Focus: start moving modal check into FocusWindow(), add ImGuiFocusRequestFlags_UnlessBelowModal (currently opt-in, should try to make opt-out). (#6357, #4317) 2023-04-21 19:06:11 +02:00
ocornut
f0fe1957a8 Focus: merge extra param for FocusTopMostWindowUnderOne() from docking branch to facilitate merge. 2023-04-21 19:05:58 +02:00
ocornut
ac38c8e6fe IO: removed ImGuiBackendFlags_HasMouseHoveredViewport assert in AddMouseViewportEvent(). 
In theory shouldn't accept them, but a backend overriding another would be prevented from doing so because of this (test engine).
 2023-04-21 18:01:18 +02:00
ocornut
00d3f9295e Nav: Fixed navigation within tables/columns where item boundaries goes beyond columns limits. (#2221) 2023-04-20 16:42:52 +02:00
ocornut
8d9e50c807 Nav: fixed IMGUI_DEBUG_NAV_SCORING not setting NavMoveClipDir, leading to debug result not matching real results. 2023-04-20 16:04:05 +02:00
ocornut
662ce46971 Debug Log: Fixed not parsing 0xXXXXXXXX values when the identifier is at the end of the line. 2023-04-20 14:52:59 +02:00
ocornut
4f692ba840 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
 2023-04-19 16:35:50 +02:00
ocornut
d6a7aca2f4 Nav: Debug: tweak debug facilities. 2023-04-18 15:47:29 +02:00
ocornut
064153fca4 Version 1.89.6 WIP 2023-04-17 14:40:00 +02:00
ocornut
0ea3b87bd6 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
 2023-04-13 16:24:09 +02:00
ocornut
1ebb913827 Version 1.89.5 2023-04-13 16:17:49 +02:00
ocornut
995f92a456 Nav: Made PageUp/PageDown/Home/End navigation also scroll parent windows. 
+ Added ImGuiDebugLogFlags_EventSelection unused in this branch.
 2023-04-12 21:38:47 +02:00
ocornut
aec062a8a5 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	examples/example_win32_directx9/main.cpp
#	imgui_internal.h
 2023-04-11 16:16:17 +02:00
ocornut
18d72a9142 Inputs: added a unique event identifier in ImGuiInputEvent. 2023-04-11 15:07:42 +02:00
Michael Martz
506f7e0074 Using nullptr in locations where warning disable is not convenient. (#6313, #4537) 2023-04-11 11:33:50 +02:00
ocornut
9203883bbe Comments + Metal using SetTexID(0) for consistency. 2023-04-11 11:22:42 +02:00
ocornut
ec461c6ccb Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	imgui_demo.cpp
 2023-04-06 19:16:08 +02:00
ocornut
8738ed88f0 Fixed FindWindowSettingsByID() being able to return a deleted setting. 2023-04-06 18:50:24 +02:00
ocornut
63370be0e5 Viewports: fix/amend dcb6335 to (1) avoid refocusing when focus action was actionned from a click within imgui boundaries and (2) restore a null focus as well. (#6299) 2023-04-06 16:29:36 +02:00
ocornut
1f0b46b93c Viewports: moved Platform_GetWindowFocus queries in UpdateViewportsNewFrame(). Added ImGuiViewportFlags_IsFocused status flag. (#1542) 
Not sure why queries were in UpdatePlatformWindows().
- initially added there on 2018/04/26 f1ae07e532 (squashed)
- slightly moved in cd51f37fc0 for the purpose of putting less constraint on backend but that check is now done on our side anyhow.
Seems more consistent to do it nxt to other polling in UpdateViewportsNewFrame().
Not using ImGuiViewportFlags_IsFocused yet.
 2023-04-06 16:08:53 +02:00
ocornut
ed72fcd12a Viewports: Internal: rename LastFrontMostStampCount -> LastFocusedStampCount. Rename ImGuiViewportFlags_Minimized -> ImGuiViewportFlags_IsMinimized 
Effectively it is currently the later, but see comment "Even without focus, we assume the window becomes front-most." in UpdatePlatformWindows().
+ Moved Window field at top since it is most useful.
 2023-04-06 15:17:52 +02:00
ocornut
dcb6335bfe Viewports: Setting focus from Platform/OS sets corresponding focus at Dear ImGui level. (#6299) 2023-04-05 20:25:05 +02:00
ocornut
ee5ce36745 Merge branch 'master' into docking, including specific merge for imgui_impl_glfw.cpp for f070497 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 2023-04-04 21:17:47 +02:00
ocornut
c9fe7ebc7b IO: Input queue trickling adjustment for touch screens. (#2702, #4921) 
+ amend two comments in imgui.h
 2023-04-04 21:05:27 +02:00
ocornut
a16f99c6a2 IO: Added io.AddMouseSourceEvent() and ImGuiMouseSource enum. (#2702, #2334, #2372, #3453, #5693) 2023-04-04 20:18:57 +02:00
ocornut
13931fd851 Redirecting domain name 
Tired of paying/maintaining two domains names and .org tend to be fluctuating + changing host company for sponsoring.
 2023-04-03 15:07:20 +02:00
ocornut
4fdafef54f Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	imgui_widgets.cpp
 2023-03-29 18:41:41 +02:00
ocornut
5f301914a0 TabBar: Tab-bars with ImGuiTabBarFlags_FittingPolicyScroll can be scrolled with horizontal mouse-wheel (or Shift + WheelY). (#2702) 2023-03-29 17:10:03 +02:00
ocornut
84fd0c7ff4 Inputs, IO: record MouseWheelRequestAxisSwap information. Apply in UpdateMouseWheel() before legacy ctrl+wheel. 2023-03-29 17:09:58 +02:00
ocornut
bf87fbcbcc Docking: Fixed using GetItemXXX() or IsItemXXX() functions after a DockSpace(). (#6217) 2023-03-22 18:58:32 +01:00
ocornut
89d09070e3 Nav: Made Ctrl+Tab/Ctrl+Shift+Tab windowing register ownership to held modifier. (#4828, #3255, #5641) 2023-03-22 15:42:14 +01:00
ocornut
ad44f5831a Merge branch 'master' into docking 2023-03-21 17:04:54 +01:00
ocornut
e55a0ef107 IO: avoid changing context in AddKeyAnalogEvent(). Amend 7269498. (#6199, #6256, #4921, #5856) 2023-03-21 14:32:37 +01:00
cfillion
7269498ecc IO: actually fixed adding events from inactive context (#6199, #6256, #4921, #5856) 2023-03-21 14:19:59 +01:00
ocornut
5a2b1e8482 InputText: Fixed a tricky edge case, ensuring value is always written back on the frame where IsItemDeactivated() returns true (#4714) 
Altered ItemAdd() clipping rule to keep previous-frame ActiveId unclipped to support that late commit.

Also, MarkItemEdited() may in theory need to do:
if (g.ActiveIdPreviousFrame == id)
        g.ActiveIdPreviousFrameHasBeenEditedBefore = true;
But this should already be set so not adding now.
 2023-03-16 21:12:57 +01:00
ocornut
314e6443c9 Internals: removed ImGuiInputSource_Nav enum, 
Essentially finishing the work of removing Nav a dual input source (with e.g. removal of NavInput[]).
 2023-03-16 20:28:05 +01:00
ocornut
6b3435a2db Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
 2023-03-16 12:01:13 +01:00
ocornut
24a44b9abe Version 1.89.5 WIP 2023-03-15 12:25:20 +01:00
ocornut
9e30fb0ec1 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
 2023-03-14 16:38:22 +01:00
ocornut
f3f6295d53 Version 1.89.4 
Commented out obsolete enums/functions names: ImGuiSliderFlags_ClampOnInput, ImGuiInputTextFlags_AlwaysInsertMode, ImDrawList::AddBezierCurve(), ImDrawList::PathBezierCurveTo()()
 2023-03-14 16:36:19 +01:00
ocornut
cc2177de15 Debug Tools: Added io.ConfigDebugBeginReturnValueOnce / io.ConfigDebugBeginReturnValueLoop options. 2023-03-14 15:25:13 +01:00
ocornut
552969e33e BeginTooltip: correctly testing return value of BeginTooltipEx() even though it always return true in current code. 
Amend 3b2f617
 2023-03-14 14:28:41 +01:00