mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-13 21:19:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,537 Commits 9 Branches 127 Tags 419 MiB
ec461c6ccb
Commit Graph

8537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ocornut
cda26635cd Inputs: refacotr/extract CalcRoutingScore() out of SetShortcutRouting(), easier to follow with early returns. 
+ clarified comments about GetMouseCursor() #5739
 2022-11-09 16:35:50 +01:00
ocornut
a571933f8b Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
 2022-11-09 15:59:26 +01:00
ocornut
b8b0f9d02e Backends: OpenGL3: Reverted use of glBufferSubData(). (#4468, #4504, #3381, #2981, #4825, #4832, #5127) 2022-11-09 15:57:54 +01:00
ocornut
f0ad810553 Inputs: tweak comments, typos. 2022-11-08 22:41:45 +01:00
ocornut
4d5da74c79 Merge branch 'master' into docking 2022-11-08 20:44:04 +01:00
ocornut
637ddfce09 Inputs, Nav: made it possible to remap CTRL+Tab (#4828, #3255, #5641) 2022-11-08 20:38:49 +01:00
ocornut
6c9c4879d9 Inputs: made Shortcut() routing id defaults to current FocusScope ID. (#456, #2637, #3724) 
One idea being that this value can be easily locked (for blind menus) or manipulated (for queries from outside).
 2022-11-08 20:37:58 +01:00
ocornut
d576724bfd Inputs: made ImGuiInputFlags_RouteFocused the default for Shortcut(). (#456, #2637, #3724) 2022-11-08 20:37:58 +01:00
ocornut
4d6a9ef93f Inputs: added routing priorities. (#456, #2637, #3724) 
- and ImGuiInputFlags_RouteUnlessBgFocused
- will be useful for blind menu handlers.
 2022-11-08 20:37:58 +01:00
ocornut
7ff2d3353c Inputs: added wip/experiment routing system: Shortcut(), RoutingFocused policy, SetShortcutRouting(). (#456, #2637, #3724) 
- InputText() uses Shortcut().
 2022-11-08 20:37:58 +01:00
ocornut
c59ebb2d71 Inputs: added basic Shortcut() function - no routing yet. (#456) 2022-11-08 20:37:58 +01:00
ocornut
8c95c084cb Inputs: changed specs of SetKeyOwner() to alter OwnerCurr immediately. 
Note the removed comments (hence not squashing)
Amend 4448d97
(#456, #2637, #2620, #2891, #3370,, #4828, #5108, #5242, #5641)
 2022-11-08 20:37:58 +01:00
ocornut
4448d975d1 Inputs: added wip/internal Input Owner system. (#456, #2637, #2620, #2891, #3370, #4828, #5108, #5242, #5641) 
- Added SetKeyOwner(), SetItemKeyOwner(), TestKeyOwner().
- Added new IsKeyXXX IsMouseXXX functions with ImGuID owner_id and flags.
- Obsoleted SetItemUsingMouseWheel(). (#2891)
- Removed IsKeyPresseedEx() which was a recent internal addition 2022-07-08 deemed to be temporary exactly for this.
- Added ImGuiButtonFlags_NoSetKeyOwner, ImGuiButtonFlags_NoTestKeyOwner
- Added ImGuiSelectableFlags_NoSetKeyOwner.
- Added ImGuiInputFlags_LockThisFrame, ImGuiInputFlags_LockUntilRelease for for SetKeyOwner(), SetItemKeyOwner().
- Added ImGuiInputFlags_CondXXX values for SetItemKeyOwner().
 2022-11-08 18:47:36 +01:00
ocornut
5728f2e15f Fix build with IMGUI_DISABLE_DEBUG_TOOLS 2022-11-04 16:47:04 +01:00
ocornut
44d98bfd6d Fix build with IMGUI_DISABLE_DEBUG_TOOLS 2022-11-04 16:35:57 +01:00
ocornut
849c8052b7 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
 2022-11-04 16:26:15 +01:00
ocornut
529cba19b0 Debug Tools: Added DebugLocateItem()/DebugLocateItemOnHover() to visually locate items when hovering a 0xXXXXXXXX value. (#5855, #2673, #4631) 2022-11-04 16:06:34 +01:00
ocornut
7109f32f96 Internals: tidying up and stripping more of focus scope code. 2022-11-04 12:19:23 +01:00
ocornut
9f66a3a9ed Internals: rework FocusScope system, current scope doesn't need to be in window + child doesn't inherit. 
Intended as part of work for input routing + blind menu processing shortcuts. Some of this commit will be stripped by next commit.
Intent was to sort windows along with focus scope to build a hierarchy, but for our needs we'd need a persistant one, so scrapping the idea. Not squashing this with next commit to keep a bit of history for future references.
 2022-11-04 12:19:20 +01:00
ocornut
1eac0024c0 InputText: copy and select all shortcuts don't need repeat (tho it was harmless0 2022-11-03 18:33:43 +01:00
ocornut
90e9465fa5 Window: Fixed position not being clamped while auto-resizing (#5843) 2022-11-02 12:36:41 +01:00
ocornut
6e9dfe1de1 Window: Auto-fit size takes account of work rectangle (menu bars eating from viewport). (#5843) 2022-11-02 12:36:22 +01:00
Akira Maezawa
86f2af2bc7 Backends: OSX: Fixed mouse coordinate before clicking on the host window. (#5842) 2022-11-02 12:02:39 +01:00
cfillion
ced92d9c52 Inputs, Viewports: fix UpdateViewportsNewFrame() running before UpdateInputEvents(), leading to MouseViewport lagging by a frame on transitions. (#5837, #4921) 
Will merge the swap in master.
 2022-10-31 12:08:23 +01:00
Rewtio
c2694ef75e Examples: Android: Using LoadIniSettingsFromMemory() / SaveIniSettingsToMemory() to save in appropriate location for Android. (#5836) 2022-10-31 11:47:05 +01:00
ocornut
22bcfca700 IO: Clear AppFocusLost in EndFrame() in order to allow backend or application code to poll and react to it 
+ Amend a241dc7 with the same clearing of MouseDownDuration[] as keyboard ones.
 2022-10-28 20:01:20 +02:00
ocornut
a241dc7990 IO: Fixed AddFocusEvent(false) to also clear MouseDown[] state. (#4921) 2022-10-27 20:17:19 +02:00
ocornut
a61bbdc239 Commented out redirecting OpenPopupContextItem() which was briefly the name of OpenPopupOnItemClick() from 1.77 to 1.79. 2022-10-26 22:22:53 +02:00
Teselka
9db6b1a0d9 Backends: Win32: minor tidying up. (#5819) 2022-10-25 16:02:53 +02:00
ocornut
baea25e657 Drag and Drop: extracted a RenderDragDropTargetRect() function (#1603) 2022-10-25 15:54:22 +02:00
ocornut
375ae5dce4 Merge branch 'master' into docking (incl glfw use of GLFW_VERSION_COMBINED) 
Note switched from GLFW_VERSION_REVISION * 10 to GLFW_VERSION_REVISION * 1
 2022-10-24 22:58:25 +02:00
ocornut
431fc6a7f6 Internals: using ItemAdd() consistently for internal items: windows & tables resize grips/borders, ScrollbarEx(). 
This put an extra flag check in ItemAdd() but essentially reduce inconsistency with windows decorations not using this. Useful for debugging.
It however buries the info/blurs the line about what it means to not use ItemAdd() since they are now doing it much less.
 2022-10-24 22:54:29 +02:00
ocornut
178aee4b1c Debug Tools: Debug Log: add and use ImGuiTextLineIndex. 
This is needed for next commit where we want to parse hovered Debug Log line.
 2022-10-24 21:23:59 +02:00
ocornut
50c4234aca Docking: Further fixes for highlight of nested nodes. (#5702) 
Amend fb0b9c71, 8f43487, 9764adc, 24dfebf
Added more regression tests e.g "docking_focus_nodes_nested"
 2022-10-24 20:34:03 +02:00
ocornut
5370b46c4e Docking: Made spacing between dock nodes not a dropping gap. 2022-10-24 20:25:42 +02:00
ocornut
578df14f27 CI: Remove left-over discord stuff. 2022-10-24 12:02:06 +02:00
ocornut
f6bd7c8e53 Debug Tools: Item Picker: remove IMGUI_DEBUG_TOOL_ITEM_PICKER_EX since it doesn't work on non-ItemHoverable() items anyway. (#2673) 
Call stack difference not meaningful.
 2022-10-21 18:32:40 +02:00
ocornut
bc918404fe Internals: using ImToUpper() since std one does too many things. 
As a bonus side-effect may remove reliance on ctype.h (will see if CI complains)
 2022-10-21 16:13:52 +02:00
ocornut
9a35bfea39 Internals: added temporary ImGuiItemStatusFlags_Visible (used internally - please do not use). 
Used by BeginMenu() as I'm experimenting with blind menus honoring shortcuts.
Extra comments about KeyMap and ImGuiKeys
 2022-10-21 14:57:10 +02:00
David
de1593d5c0
Backends: DX12: Fixed stale comments. (#5798) 2022-10-20 08:25:00 +02:00
ocornut
e3fa56ae05 BeginMenu(): Menus: Fixed a one-frame issue where SetNextWindowXXX data are not consumed by a BeginMenu(). 
+ Shallow tweaks to reduce diff of future branches. Removing early return also facilitate some changes.
 2022-10-19 14:12:04 +02:00
ocornut
5ac94ad898 Window: Fixed an issue where uncollapsed a window would show a scrollbar for a frame. 
Amend / fix regression from 6e8e2c0
 2022-10-18 16:43:38 +02:00
ocornut
ab6e48b833 Backends: GLFW: Perform a dummy glfwGetError() read to cancel missing mouse cursors errors. (#5785) 2022-10-18 12:21:31 +02:00
ocornut
f87e891f18 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2022-10-14 18:50:40 +02:00
ocornut
08752b372e Menus, Popups: Experimental fix for issue where clicking on an open BeginMenu() item called from a window which is neither a popup neither a menu used to incorrectly close and reopen the menu. (#5775) 
This works by moving the ClosePopupsOverWindow() in FocusWindow() in the if() block which luckily solves our problem.
In our test suite I couldn't find situation where this had side-effect others than BeginMenu() using the 'menuset_is_open' trick.
It's difficult to tell if other side-effects are possible: a window being already focused should mean it doesn't have popups overit.
Effectively this means that clicking e.g. on the BeginMenu() item to close a menu in a menu-bar now relies on BeginMenu() logic for the closure rather than FocusWindow() triggerd by button behavior.
 2022-10-14 18:47:00 +02:00
ocornut
81176737f8 Menus: Fixed using IsItemHovered()/IsItemClicked() on BeginMenu(). (#5775) 2022-10-14 17:39:04 +02:00
ocornut
3920b1c764 Removed commented out old flags from when Tables was a branch. 
ImGuiTableFlags_ColumnsWidthFixed, ImGuiTableFlags_ColumnsWidthStretch,
ImGuiTableFlags_SizingPolicyFixed, ImGuiTableFlags_SizingPolicyStretch
ImGuiTableColumnFlags_WidthAuto
 2022-10-14 16:36:41 +02:00
ocornut
b15347cb7d Tables: activating an ID (e.g. clicking button inside) column doesn't prevent columns output flags from having ImGuiTableColumnFlags_IsHovered set. (#2957) 2022-10-13 15:15:42 +02:00
ocornut
3e8d198133 Removed runtime patching of obsolete/invalid "%f"/"%.0f" types of format strings for DragInt()/SliderInt(). 2022-10-12 23:09:09 +02:00
thedemons
5196bd15e9
Docs: Update outdated code sample (#5766) 2022-10-11 17:45:27 +02:00