Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,962 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9948535118'
${ noResults }
Commit Graph

4873 Commits (994853511803cd37ccb0e804442049c947b09cc3)

Author SHA1 Message Date
ocornut 92c4ff1c2f Rename ImGuiKey_LeftControl to ImGuiKey_LeftCtrl, ImGuiKey_RightControl to ImGuiKey_RightCtrl + made key order match mods order. (#4858) 3 years ago
ocornut 6188e94108 Examples: Vulkan: fill Subpass and MSAASamples to increase discoverability (#4886) + IO docs update (#4858) 
https://github.com/mosra/magnum-integration/pull/89
 3 years ago
ocornut e51a0a80ca IO: fix SetKeyEventNativeData() not handling ImGuiKey_None the same way as AddKeyEvent(). (#4905, #4858) 3 years ago
ocornut 9551635684 IO: fix SetKeyEventNativeData() not handling ImGuiKey_None the same way as AddKeyEvent(). (#4905, #4858) 3 years ago
ocornut 0647ba3bad Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
 3 years ago
ocornut 7f8a89c25c Backends: Win32, SDL: maintain MouseButtonsDown instead of using IsAnyMouseDown(). Internals: added GetInputSourceName(). 3 years ago
ocornut 956e03009a Backends: OSX: Build fIx. Made GetKeyName() input tolerant. Internals: added GetNavInputName(). 3 years ago
ocornut acfc7798fd Rename io.AddKeyModEvent() -> io.AddKeyModsEvent() and updated backends accordingly. (#2625, #4858) 
Amend 790132a (breaking)

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
 3 years ago
ocornut e8172fdfbc Rename io.AddKeyModEvent() -> io.AddKeyModsEvent() and updated backends accordingly. (#2625, #4858) 
Amend 790132a (breaking)
 3 years ago
ocornut ef681e7019 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_sdl.h
#	backends/imgui_impl_win32.cpp
#	backends/imgui_impl_win32.h
#	imgui.cpp
 3 years ago
ocornut 790132a672 Added io.AddKeyModEvent() and updated backends accordingly. (#2625, #4858) 3 years ago
ocornut bf08c13e9b Inputs: Extra Keys / AddKeyEvent(): bidirectional mapping, basic CI, simplify backends, asserts on misuses, tested backward compat. (#2625, #4858, #2787) 
(edit: simplified backends merged into previous commits to make history clearer)
 3 years ago
thedmd 3b66929301 Inputs: Extra Keys / AddKeyEvent(): Added ImGuiKey values, io.AddKeyEvent(), GetKeyName(), IMGUI_DISABLE_OBSOLETE_KEYIO. Obsoleted GetKeyIndex(), io.KeyMap[], io.KeysDown[]. (#2625, #4858, #2787) 3 years ago
ocornut afffcd5810 Inputs: rename ImGuiKey_KeyPadEnter > ImGuiKey_KeypadEnter (#2625) 3 years ago
ocornut 4d023bd7fe Fix for using IMGUI_DISABLE_OBSOLETE_FUNCTIONS 3 years ago
ocornut 704ab1114a Merge branch 'master' into docking. Remove Platform_SetImeInputPos. Remove backend-side IME implementation. Rrevert removal of MouseDragMaxDistanceAbs in 206b9ea. (#2589, #3113) 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp
 3 years ago
actboy168 29a8ee0826 Platform IME: add ImGuiPlatformImeData::WantVisible, hide IME when not used. (#2589) 3 years ago
ocornut 1cbfe93520 Platform IME: [windows] call ImmSetCandidateWindow() to position candidate window. 3 years ago
ocornut 2706c9d66e Platform IME: reworked internals to simplify adding new features. 3 years ago
ocornut 3a90dc3893 Platform IME: changed io.ImeSetInputScreenPosFn() to io.SetPlatformImeDataFn() API. 
Ref #2589, #2598, #3108, #3113, #3653, #4642
 3 years ago
ocornut 04bc0b0bb8 Fix IdxBuffer related comments. (#4845, #4863) 3 years ago
ocornut 28eabcb099 Internals: refactor: mouse input functions into their own section. 3 years ago
ocornut 206b9ead8f IO: removed unused MouseDragMaxDistanceAbs(). Using a shortcut variable in UpdateMouseInputs(). 3 years ago
ocornut afb1180d7d Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
 3 years ago
ocornut b0a6cd6305 Fixed a situation where CTRL+Tab or Modal can occasionally lead to the creation of ImDrawCmd with zero triangles, (#4857) 
(2nd amend)
 3 years ago
ocornut 2402958aec Commented out redirecting functions/enums names that were marked obsolete in 1.69, 1.70, 1.71, 1.72 
- ImGui::SetNextTreeNodeOpen() -> use ImGui::SetNextItemOpen()
- ImGui::GetContentRegionAvailWidth() -> use ImGui::GetContentRegionAvail().x
- ImGui::TreeAdvanceToLabelPos() -> use ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetTreeNodeToLabelSpacing());
- ImFontAtlas::CustomRect -> use ImFontAtlasCustomRect
- ImGuiColorEditFlags_RGB/HSV/HEX -> use ImGuiColorEditFlags_DisplayRGB/HSV/Hex
 3 years ago
ocornut 9c8f288d1a Viewports: Fixed a CTRL+TAB crash with viewports enabled (#4023, #787) (amend 1dc3af3, 23ef6c1, 657073a) 
+ Expose FindHoveredViewportFromPlatformWindowStack() in imgui_internal.h
 3 years ago
ocornut 2aa9959553 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
 3 years ago
ocornut dbeea7220f Backends: Silence overzealous warnings. (#4834) Add comments about SetDragDropPayload() return value. (#4835) 3 years ago
ocornut 89a28209e8 Version 1.87 WIP + Backends: OpenGL3: Fixed a buffer overflow in imgui_impl_opengl3_loader.h init, added in 1.86 (#4468, #4830) 3 years ago
ocornut 15b4a064f9 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	examples/example_marmalade/main.cpp
#	imgui.cpp
#	imgui.h
 3 years ago
ocornut 512c54bbc0 Version 1.86 3 years ago
ocornut 612b787b0d Menus: fixed top-level menu from not consistently using style.PopupRounding. (#4788) 
+ Stack tool default size.
 3 years ago
ocornut d9bc1e44af Backends: Marmalade: Removed obsolete Marmalade backend (imgui_impl_marmalade.cpp) + example. (#368, #375) 3 years ago
ocornut 4a43dcb940 Internals: reduced side-effects of setting window->HiddenFramesForRenderOnly > 0 3 years ago
ocornut 06d5f9297d Internals: reduced side-effects of setting window->HiddenFramesForRenderOnly > 0 3 years ago
ocornut 248ed1b01d Internals: UpdateWindowInFocusOrderList: amend a528398 to fix docking. (#3496, #4797) 3 years ago
ocornut 1c4066cd9e Internals: UpdateWindowInFocusOrderList: amend a528398 to fix docking. (#3496, #4797) 3 years ago
ocornut cd36acc88b Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	imgui.cpp
 3 years ago
ocornut 48f263336b Menus: fixed closing a menu inside a popup/modal. Fixed menu inside a popup/modal not inhibiting hovering of items in the popup/modal. (#3496, #4797) 
Fixed sub-menu items inside a popups from closing the popup (debatable).
 3 years ago
ocornut a528398c77 Internals: support for varying _ChildWindow flag for menu windows. (#3496, #4797) 3 years ago
ocornut 11638fdf7d Menus: reuse more menu windows when stacked over popups. 
This is actually mostly aimed at ensuring the _ChildWindow flag on menu window doesn't vary as this would cause issues with our current g.WindowsFocusOrder[] scheme
 3 years ago
xndcn 8a9fe26866 Menus: fixed closing a menu by clicking on its menu-bar item when inside a popup. (#3496, #4797) 3 years ago
ocornut 747f7fdbba Docking: prevent docking any window created above a popup/modal. (#4317) 3 years ago
ocornut f605351307 Added an assertion for the common user mistake of using "" as an identifier at the root level of a window. (#1414, #2562, #2807, #4008, #4158, #4375, #4548, #4657, #4796) 
#4158, #4375, #4548, #4657, #4796)
 3 years ago
ocornut c801799218 Added an assertion for the common user mistake of using "" as an identifier at the root level of a window. (#1414, #2562, #2807, #4008, #4158, #4375, #4548, #4657, #4796) 
#4158, #4375, #4548, #4657, #4796)
 3 years ago
ocornut a8e1dde357 Fix static analyser, update readme. 3 years ago
ocornut e31d116d37 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	imgui.cpp
#	imgui_internal.h
 3 years ago
ocornut e03383d088 Fixes for tooltip over modals leading to incorrect modal dimming. (#4729) 
Amend 23ef6c1. Should rework tooltip to be in a consistent position in g.Windows[]
 3 years ago
ocornut 270d4d0855 Nav, Docking: Fix crash on dimming docked window and DockSpaceOverViewport() with PassthruCentralNode. 
(amend 1dc3af3, 23ef6c1, 657073a)

# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 0647cf434c Nav, Docking: Fix crash on dimming docked window and DockSpaceOverViewport() with PassthruCentralNode. 
(amend 1dc3af3, 23ef6c1, 657073a)
 3 years ago
Rokas Kupstys b38af0f522 Popups: Fix popups being closed by newly appearing windows. (#4317) 
* Popups/modals now remain open when new windows are created from within popup/modal begin stack.
* Modals are not closed when new window appears behind active modal.
Tested by "window_popup_interruptions"
 3 years ago
ocornut fc198fe1db Nav, Docking: Fix dimming on docked windows. 3 years ago
ocornut c1b70e0391 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 657073a650 Nav, Docking: fix dimming crash with accessing zero-cmd ImDrawList (amend 1dc3af3, 23ef6c1) 
# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 20e040c858 Clipper, Tables: remove table specific code path should now be ok (added assert). 3 years ago
ocornut 926addbfe2 Clipper: fixed invalid state when number of frozen table row is smaller than ItemCount. 
+ Bonus rather unorthodox coding style.
 3 years ago
ocornut 027a7ba3eb Clipper: use line size instead of cursor comparaison when range are large. (#3609, #3962 + https://github.com/ocornut/imgui_club/issues/20) 3 years ago
ocornut a76bc52da5 Window, Clipper: store initial precision loss and apply in clipper. (#3609, #3962 + https://github.com/ocornut/imgui_club/issues/20) 3 years ago
ocornut 6e141a9cae Internals: made ScrollbarEx() use ImS64 to facilitate use with larger ranges (not fully tested) + clipper tweaks (#3609, #3962 + https://github.com/ocornut/imgui_club/issues/20) 
This does NOT fix all problems with large ranges and floating point precision, it merely attenuate them.
 3 years ago
ocornut 06e4f4e370 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	imgui.cpp
#	imgui.h
 3 years ago
ocornut 23ef6c149e Reworked modal/ctrl+tab dimming system to be entirely processed at end of the frame (backported 1dc3af3 from docking) 3 years ago
ocornut 1dc3af381a Nav, Docking: reworked modal/ctrl+tab dimming system to be entirely processed at end of the frame, which will simplify things for an upcoming commit. 
(Will backport some of this back to master now.)
 3 years ago
ocornut da3a36eefd Backport from docking branch: minor stuff. 
Fixed software mouse cursor being rendered multiple times if Render() is called more than once.
 3 years ago
ocornut c122c0ef89 Docking: Amend b16f738 fixed dimming of docked window + removed thin highlight around windows (never worked on docked window, not viewports friendly, hard to move to EndFrame) (#2700, #2539, #2522) 3 years ago
ocornut b16f738d04 Docking: docked windows honor ImGuiCol_WindowBg. Host window in charge of rendering seams. (#2700, #2539 + Docked windows honor display their border properly. (#2522) 
Plus: better support for transparent one in nodes
Side effects: DockContextBindNodeToWindow doesn't alter node->IsVisible.
Side effects: ImDrawList:: _ResetForNewFrame() needs to merge, sane (in case of
(Amended, force-pushed)
 3 years ago
ocornut 78c6435dbb Inputs: (breaking wip) removed IsMouseTripleClicked() added recently (during 1.86 WIP), replaced with GetMouseClickedCount(). (#3229) 3 years ago
ocornut bf80204e63 Docking: internals: extracted rounding corner calculation into reusable CalcRoundingFlagsForRectInRect() function. 3 years ago
ocornut 8733ca49b0 Docking: Fixed single-frame node pos/size inconsistencies when window stop or start being submitted. 
Fix 718e15c7d while preserving its intended property. Tested by "docking_window_appearing_layout". (#2109)
 3 years ago
ocornut 6afcfe3442 Docking: Fixed incorrectly rounded tab bars for dock node that are not at the top of their dock tree. 3 years ago
ocornut 848d21b6b5 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_sdlrenderer.cpp
#	backends/imgui_impl_sdlrenderer.h
#	imgui.cpp
#	imgui_widgets.cpp
 3 years ago
ocornut 5b1a70aa2d Fixed RenderRectFilledWithHole() (used by docking) + added dummy EndFrameDrawDimmedBackgrounds() stub in master. 
The round corner flag change in 033dfd9d forgot to default to _None.
 3 years ago
ocornut 1ab3007752 Viewports: Fixed CTRL+TAB highlight outline on docked windows not always fitting in host viewport + moved EndFrameDrawDimmedBackgrounds() call + removed duplicate code in Begin() already in EndFrameDrawDimmedBackgrounds() 3 years ago
Mikko Sivulainen 5f5ba8eb11
Docking: Fix typo (had no side effect) (#4778) 
Co-authored-by: Mikko Sivulainen <mikko.sivulainen@supercell.com>
 3 years ago
ocornut f087a5b856 Metrics: Added a node showing windows in submission order and showing the Begin() stack. 3 years ago
ocornut c5db276521 InputText, Nav: fixed tabbing through InputTextMultiline(). (#4761, #3092) 
Messy... Broken by 66f0fb9. Added ImGuiItemFlags_NoTabStop to EndGroup() ahead of time (not strictly needed here).
 3 years ago
ocornut 9d704d99d3 Internals: wrapped ImQsort() in an inline function + added a define guard. 3 years ago
ocornut 719d931304 Docking: Fixed a bug undocking windows docked into a non-visible or _KeepAliveOnly dockspace. (#4757) 3 years ago
ocornut ea83d040e6 Viewports: fix missing default per-window value for ParentViewportId due to zero-cleared in-window instance (#4756) 
Broken by 2080d12b
 3 years ago
ocornut 7f38773b73 Fixed crash on right-click without modal, introduced by previous commit a3667f46, (#4729) 3 years ago
ocornut 764f9e606d Fixed crash on right-click without modal, introduced by previous commit a3667f46, (#4729) 3 years ago
ocornut b50b22d787 Fixed tooltip in own viewport over modal from being incorrectly dimmed. (#4729) 
Normally we would aim to ensure that g.Windows[] gets maintained to reflect display layer but it is presently non trivial.
 3 years ago
ocornut a3667f462a Fixed tooltip in own viewport over modal from being incorrectly dimmed. (#4729) 
Normally we would aim to ensure that g.Windows[] gets maintained to reflect display layer but it is presently non trivial.
 3 years ago
ocornut 2080d12bd9 Viewports: Made it possible to explicitly assign ImGuiWindowClass::ParentViewportId to 0. (#3152, #2871) 3 years ago
ocornut d80a9123b7 Internals: move chunks of IsItemHovered() so upcoming commit can be less noisy. This commit should be a no-op (check by comparing without white-space changes) 3 years ago
ocornut 2c29e391dd Drag and Drop: BeginDragDropSource() with ImGuiDragDropFlags_SourceAllowNullID doesn't lose tooltip when scrolling. (#143) 
Reduced amount of self critical commentary since it'll appear like a hack for users but it isn't more a hack than many other things.
 3 years ago
ocornut f8a806ad9f Tooltips, Internal: (Breaking) swapped parameter order to accomodate for future tooltip api rework. 3 years ago
ocornut dc8c3618e8 Merge branch 'master' into docking 
# Conflicts:
#	imgui_demo.cpp
 3 years ago
ocornut cad790d43b Nav: fixed backwrap tabbing wrap on sibling child windows with _NavFlattened flag. (#4449) 
Amend 1a7526dc
 3 years ago
ocornut e790fc0e79 Nav: prevent child from clipping items when using _NavFlattened and parent has a pending nav request. (#787) 3 years ago
ocornut a9ea1ae854 Nav: fixing assert using Tab in a window without any tabbable element (#4449) 
Amend 1a7526dc
 3 years ago
ocornut eb02dcf87f Nav: enable move/resize window with keyboard in Ctrl+Tabbing windowing menu even without _NavEnableKeyboard. (#4023, #787). 3 years ago
ocornut 8ce23b3ccd Nav: Ctrl+tabbing to cycle through windows is now enabled regardless of _NavEnableKeyboard. (#4023, #767) 3 years ago
ocornut bce1ba400f Clipper: add ForceDisplayRangeByIndices (#3841, #3578) 
This partially reverts commit 6a7e2c74fb.
 3 years ago
ocornut b17dffffb3 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 1a7526dcd4 Nav, Tabbing: refactor tabbing system to support clipped items, scrolling, using nav queries. (#4449) 
Not using counter/modulo anymore and special provisions to handle tab wrapping with ImGuiListClipper. Wrapping may be done better as a next-frame forwarded request.
Also one extra step toward #3949 #3985
 3 years ago
ocornut f01a6d3e8f InputText, Nav: fixed repeated calls to SetKeyboardFocusHere() preventing to use InputText(). (#4682) 
+ Stack Tool: favor inspecting HoveredID over ActiveID as the later is more likely to be locked.
 3 years ago
ocornut c1d2793580 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 3 years ago
ocornut 32779c5b64 Clipper: hotfix (amend 93cccd2, was broken) (#3841, #1725) 3 years ago
ocornut 64daeddf6f Removed CalcListClipping() function. (#3841) 3 years ago