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

863 Commits (53589092b22b6fa5e92140f30621b6d40eea4eb2)

Author SHA1 Message Date
ocornut dedb381c51 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	examples/imgui_examples.sln
#	imgui.cpp
#	imgui.h
 4 years ago
ocornut 7c4ffe490d Menus: added internal's BeginMenuEx() matching MenuItemEx() with icon parameter. (amend f8fae022) 4 years ago
ocornut ccfb20095e Nav: small refactor of forwarding, clarified that MoveDir only set when RequestActive, removed one indent level in NavUpdatePageUpPageDown(). 4 years ago
ocornut 20a1edef89 Nav: made EndMenuBar() use NavMoveRequestForward() for consistency. Moved forward clearing to NavMoveRequestApplyResult(). Improved/fixed comments. 4 years ago
ocornut 780c1ee265 TextUnformatted: Accept null ranges including (NULL,NULL) without asserting. (#3615) 4 years ago
ocornut 0608887fb5 InputTextMultiline: Fixed label size not being included into window contents rect unless the whole widget is clipped. 4 years ago
ocornut 0649f750b4 Version 1.85 WIP 4 years ago
ocornut 5a7d18a441 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 4 years ago
ocornut d2ffbd9b86 Version 1.84 
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
 4 years ago
ocornut c543d93af1 Expose BeginDisabled()/EndDisabled() in public API. Add to demo. (#211) 4 years ago
ocornut 0b06c4b2b0 Merge branch 'master' into docking (will need further for io.AddFocusEvent) 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 4 years ago
ocornut 161b74e871 Fix tabbing in/out of an InputTextMultiline(), broken by 6b8a059. 4 years ago
Oliver 'kfsone' Smith 7e9e1ff1c2 InputText: Fix named filtering flags disabling newline or tabs in multiline inputs (#4409, #4410) 4 years ago
ocornut f9b5168fb3 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 4 years ago
ocornut e362c5af48 Internals: ColorEdit: renamed some internal masks to match our common coding style. 
ImGuiColorEditFlags__DisplayMask > ImGuiColorEditFlags_DisplayMask_, ImGuiColorEditFlags__OptionsDefault > ImGuiColorEditFlags_DefaultOptions_, ImGuiColorEditFlags__DataTypeMask > ImGuiColorEditFlags_DataTypeMask_  etc.
 4 years ago
ocornut 7bfc379a23 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 4 years ago
ocornut 90bf996e1a Internals: widgets always read back from g.LastItemData.InFlags (so we can now modify per-item disable state more easily). (#211) 4 years ago
ocornut 6b8a059fc9 Internals: moved LastItem data to a shared structure (instead of one per window) 
(should be a no-op as we are restoring things in Begin/End. Toward faciliate backup/restore of LastItemData and favor pulling from here instead of CurrentItemFlags, toward #211)
 4 years ago
ocornut 1ad153056a Internals: ItemAdd: set LastItemXXX fields before navigation calls + comments about io.IniFilename (#4294) 4 years ago
ocornut 17ec4f1f6f TestEngine, MenuItem: call IMGUI_TEST_ENGINE_ITEM_INFO() at the right stack level. (amend f8fae02) 4 years ago
ocornut 246ad6c03c Disabled: items more consistently release active id if the active item got disabled. (#211) (amend 2952525) 4 years ago
ocornut a11f36811f Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
 4 years ago
Rokas Kupstys 5dd1e38b7a Disabled: disabled items set HoveredId, allowing e.g. HoveredIdTimer to function. (#211, #3419) + Menus: fix hovering a disabled menu or menu item not closing other menus. 
Rework of https://github.com/rokups/imgui/commit/c24b470
Note that the declared intent of that commit "Prevents window from being dragged if mouse hovers a disabled item." was already fullfilled by a876ad87.
Changes in ButtonBehavior() not needed anymore since ImGuiButtonFlags_Disabled is gone
 4 years ago
ocornut cac869b333 Disabled: don't prevent Selectable() from being selected. (#211) + BeginMenu()/MenuItemEx() uses PushDisabled() the standard way. 
ImGuiSelectableFlags_Disabled is now unused by the library and might be marked obsolete later.
 4 years ago
ocornut 29525255f3 Disabled items more consistently release active id if the active item got disabled. (#211) 4 years ago
ocornut ba1c8464ef Internals: Removed ImGuiButtonFlags_Disabled (which had inconsistent behavior) in favor of ImGuiItemFlags_Disabled. Selectable()'s ImGuiSelectableFlags_Disabled now uses the later. (#211) 4 years ago
ocornut f6682404e1 InputInt/InputFloat: When used with Steps values and _ReadOnly flag, the step button look disabled. (#211) 4 years ago
ocornut 97638bf977 BeginMenu: remove unnecessary call to ItemHoverable() which is already done by the Selectable() call. 
Amend 88d7b3de
 4 years ago
ocornut 4a100f7f11 Nav: Disabled items are not candidate for default focus. (#211, #787) + simplify handling of ImGuiButtonFlags_PressedOnDragDropHold path. 4 years ago
ocornut f8fae02270 Menus: rework to allow for an icon column (not yet exposed, but usable via internals) + fix menus being affected by style.SelectableTextAlign (#126) 4 years ago
ocornut 696d3e056e Internals: Menus: Naming offset field + fix spacing/offset computation to handle more offsets. 4 years ago
ocornut 3512f2c2c2 Internals: Menus: minor tidying up + renaming in ImGuiMenuColumns + removing extraneous offset field which is always zero + using smaller types. 
sizeof() 36 -> 20
 4 years ago
ocornut 0f7eb00f67 Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys(). 
No need to clear fields before deletion. DX12: renamed to match docking branch.
 4 years ago
ocornut ac35b4bba2 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
 4 years ago
ocornut 20d415e939 FIx static analysers warnings and disable false positives. 4 years ago
ocornut 1965f38e9e ImGuiWindowFlags_UnsavedDocument/ImGuiTabItmeFlags_UnsavedDocument display a dot instead of a '*'. 4 years ago
ocornut f0c4d609a6 Default window focus scope not 0. Added ImGuiSelectableFlags_SelectOnNav with comments and caveats. (#1861, #4242,) 
Focus scope default value: amend 7ee623d9 a5041c88 2ebe08be
 4 years ago
ocornut a15c42d5bd Nav: moved RenderNavHighlight() calls of TreeNode and Selectable out of if (hovered || selected) tests. Should make no difference as NavId currently returns hovered. (#1861, #4242) 4 years ago
Rokas Kupstys d5828cd988 SplitterBehavior: fix using IsItemHovered() after SplitterBehavior() 4 years ago
ocornut 0cca0d1617 Internals/experimental: BeginComboPreview(), EndComboPreview(). (#4168, #1658) 
(amended)
 4 years ago
ocornut db0338a1f2 Nav, Drag and Drop, Docking: fixed two issues leading nav result to conflict with moving a window. (#4211, #3025) 4 years ago
ocornut 16abfa5eb6 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 4 years ago
ocornut 060b6ee7d1 Internals: Combo: Extracted into a BeginComboPopup() function. (#4168) 
Renamed frame_bb > bb locally.
 4 years ago
ocornut 5b4bc985ad Nav, Combo: removed unnecessary window->LastNavIds[] assignment in combo code. + minor renaming. 4 years ago
ocornut 79e18896fe TabBar: Fixed using more than 32 KB-worth of tab names. (#4176) 4 years ago
ocornut 1ad1429c6d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
 4 years ago
ocornut e31d13fa76 Version 1.84 WIP 4 years ago
ocornut 1b435ae3e0 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 4 years ago
ocornut ad5d1a8429 Version 1.83 4 years ago
ocornut 029c83c73e Combos: Changed the combo popup to use a different id to also using a context menu with the default item id. (#4167) 4 years ago