382 Commits (a6f37287d8d71145fa5601524f4227f25c656f91)

Author SHA1 Message Date
omar 9f200d10d5 Version 1.52 7 years ago
omar 5afee1c6f3 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar 8dd7648db2 Comments 7 years ago
omar ccdb58b17e Internal: Added ImVec4 operators 7 years ago
omar 6243252d5a Internal: BeginTooltipEx() in imgui_internal.h 7 years ago
omar f10a1d7b9e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar d42f6bb6cc Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch) 7 years ago
omar c432fcf2bb Minor renaming. 7 years ago
omar a6ff14d66e Exposed IM_ARRAYSIZE() in imgui.h 7 years ago
omar 549f9e3f03 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar 4faf99eff5 Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported (#211, #1012) 7 years ago
omar d513546325 Merge branch 'master' into navigation 7 years ago
omar de72e9cc87 Internals: ImLerp() helper for ImVec4 7 years ago
omar 20983773f1 Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. (#787)
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
7 years ago
omar d29a6a5a5a Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area. 7 years ago
omar 51eed2f257 Merge branch 'master' into navigation 7 years ago
omar 5b699517d4 Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits) 7 years ago
omar d3c2e904d8 Internals: Added ImLinearSweep() helper. 7 years ago
omar 938f1b720f Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 370a48c10b Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir 7 years ago
omar a03093b2d4 CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787) 7 years ago
omar 29a652adee CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787) 7 years ago
omar a126c702d9 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar ef3f87eec5 Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later. 7 years ago
omar 1c4af303bf Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy(). 7 years ago
omar bf778ebb7e Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker. 7 years ago
omar 78a85ba3fe Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4) 7 years ago
omar 2739b6ebcd Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3) 7 years ago
omar 4aa9d2089d Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2) 7 years ago
omar 55d873875e Begin: Work toward obsoleting the 5-arguments Begin() overload. (1) 7 years ago
omar d761825cfb Nav: Renaming a field + Comments. 7 years ago
omar c42baf392a Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it. 7 years ago
omar f852b9a52a Exposed Scrollbar() in imgui_internal.h and removed a bool arg 7 years ago
omar b667d5a9e7 Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() (#787) 7 years ago
omar 0371219222 Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. (#787)
May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().
7 years ago
omar 4be967823f Exposed Scrollbar() in imgui_internal.h and removed a bool arg 7 years ago
omar 7a14d7dfdc Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. (#787) 7 years ago
omar 69dd895358 Nav: Renaming NavInitDefaultRequest -> NavInitRequest 7 years ago
omar d2975115cd Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources) 7 years ago
omar c3105919ba Nav: Minor tweaks also toward removing processing from ItemAdd() 7 years ago
omar 64ce83b9ed Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 042153d254 Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter 7 years ago
omar 59c6f35bf6 Added ActivateItem(), GetItemID() functions. 7 years ago
omar 80c4e2fe7b Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons. 7 years ago
omar 2f27b733be Nav: Fixed uninitialized context variables for sanity. 7 years ago
omar f2c9bd8d4f Nav: Fixed uninitialized context variables for sanity. 7 years ago
omar f326fac64a Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). (#787) 7 years ago
omar 42ee537be3 Comments 7 years ago
omar a56b71e866 Nav: Added code to render thin highlight type. (#787) 7 years ago
omar 64a51327d3 Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) (#787) 7 years ago
omar 74da533c93 Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) (#787) 7 years ago
omar 88a354585a Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. (#787, #126)
Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)
7 years ago
omar 587e637db0 Nav: Taking note that we should aim to remove MenuBarAppending later. 7 years ago
omar 1eaa9d0621 Nav: Fixed uninitialized variable (that had no side-effects due to the code/data flow involved) 7 years ago
omar 8a5a29f0be Nav: Renamed internal field. 7 years ago
omar 9712a81f85 Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data. 7 years ago
omar 9737efb2f1 Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. (#787) 7 years ago
omar 8a814487fe Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 30b1d85962 Nav: Commiting some better organized Debug helper because this going to stay for a bit. 7 years ago
omar 164f22d5b7 Comments 7 years ago
omar df366b230e ColorPicker4: Use nav flag to provide a slighly better experience when using navigation (#787, #346) 7 years ago
omar 2d859dee4e Nav: Added ImGuiItemFlags_NoNav item flag 7 years ago
omar 4b4e455c40 Nav: Internal nenaming 7 years ago
omar 50ba543743 Comments 7 years ago
omar e0a2a832cd Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent (#787) 7 years ago
omar ca4db8c905 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 926c1cf9a4 Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag 7 years ago
omar f99348711b Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that. 7 years ago
omar d394c7ad0b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 0106dcbd02 Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily. 7 years ago
omar 35f65e05ed Merge branch 'master' into navigation 7 years ago
omar fafe65a8fc Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name. 7 years ago
omar 7bcb1d3816 Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this 7 years ago
omar cc26db8ec7 Merge branch 'master' into navigation 7 years ago
omar 0adcddac39 IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing. 7 years ago
omar 99c7622a1b ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered(). 7 years ago
omar a2b2e56e8e Merge branch 'master' into navigation 7 years ago
omar 8374a454da Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures. 7 years ago
omar 8fd4beddb8 Merge branch 'master' into navigation 7 years ago
omar 072d6d8cb5 ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited) 7 years ago
omar f1a20ec66d Merge branch 'master' into navigation 7 years ago
omar be03882a15 Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars. 7 years ago
omar 69d0d33451 Exposed PushMultiItemsWidths() to imgui_internal.h 7 years ago
omar 7e8069dd23 Merge branch 'master' into navigation 7 years ago
omar 0d56140b4a BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
7 years ago
omar 4b82759598 SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
7 years ago
omar 0a5fb24f10 Popups: Exposing a little more of popups internals in imgui_internals.h 7 years ago
omar 44e8d94aba Merge branch 'master' into navigation 7 years ago
Bruce Mitchener 2fcdeb7f12 Remove commas after last item in enumeration.
This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions.
7 years ago
omar 66a9d4856c Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar cb2775ae54 Internals: ImGuiItemFlags comments 7 years ago
omar 62d7fa4324 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar f63c03c464 Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch. 7 years ago
omar 5c4fda0fbc Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 2169bf6895 Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317) 7 years ago
omar 790605e359 Minor comments + renaming internal fields 7 years ago
omar e8dbf1c795 Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api. 7 years ago
omar 804ee78731 Added IsWindowAppearing(). 7 years ago
omar ddf41b0398 Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl. 7 years ago
omar 358e7a194e Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function. 7 years ago