@@ -3553,7 +3553,7 @@ bool IGFD::KeyExplorerFeature::m_FlashableSelectable(const char* label, bool sel
35533553 window->ClipRect .Max .x = backup_clip_rect_max_x;
35543554 }
35553555
3556- const bool is_multi_select = (g.LastItemData .InFlags & ImGuiItemFlags_IsMultiSelect) != 0 ;
3556+ const bool is_multi_select = (g.LastItemData .ItemFlags & ImGuiItemFlags_IsMultiSelect) != 0 ;
35573557 if (!is_visible)
35583558 if (!is_multi_select || !g.BoxSelectState .UnclipMode || !g.BoxSelectState .UnclipRect .Overlaps (bb)) // Extra layer of "no logic clip" for box-select support (would be more overhead to add to ItemAdd)
35593559 return false ;
@@ -3590,7 +3590,7 @@ bool IGFD::KeyExplorerFeature::m_FlashableSelectable(const char* label, bool sel
35903590 if (flags & ImGuiSelectableFlags_AllowDoubleClick) {
35913591 button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick;
35923592 }
3593- if ((flags & ImGuiSelectableFlags_AllowOverlap) || (g.LastItemData .InFlags & ImGuiItemFlags_AllowOverlap)) {
3593+ if ((flags & ImGuiSelectableFlags_AllowOverlap) || (g.LastItemData .ItemFlags & ImGuiItemFlags_AllowOverlap)) {
35943594 button_flags |= ImGuiButtonFlags_AllowOverlap;
35953595 }
35963596
@@ -3626,9 +3626,9 @@ bool IGFD::KeyExplorerFeature::m_FlashableSelectable(const char* label, bool sel
36263626
36273627 // Update NavId when clicking or when Hovering (this doesn't happen on most widgets), so navigation can be resumed with gamepad/keyboard
36283628 if (pressed || (hovered && (flags & ImGuiSelectableFlags_SetNavIdOnHover))) {
3629- if (!g.NavDisableMouseHover && g.NavWindow == window && g.NavLayer == window->DC .NavLayerCurrent ) {
3629+ if (!g.NavHighlightItemUnderNav && g.NavWindow == window && g.NavLayer == window->DC .NavLayerCurrent ) {
36303630 SetNavID (id, window->DC .NavLayerCurrent , g.CurrentFocusScopeId , WindowRectAbsToRel (window, bb)); // (bb == NavRect)
3631- g.NavDisableHighlight = true ;
3631+ g.NavCursorVisible = false ;
36323632 }
36333633 }
36343634 if (pressed) MarkItemEdited (id);
@@ -3647,9 +3647,9 @@ bool IGFD::KeyExplorerFeature::m_FlashableSelectable(const char* label, bool sel
36473647 RenderFrame (bb.Min , bb.Max , col, false , 0 .0f );
36483648 }
36493649 if (g.NavId == id) {
3650- ImGuiNavHighlightFlags nav_highlight_flags = ImGuiNavHighlightFlags_Compact | ImGuiNavHighlightFlags_NoRounding ;
3651- if (is_multi_select) nav_highlight_flags |= ImGuiNavHighlightFlags_AlwaysDraw ; // Always show the nav rectangle
3652- RenderNavHighlight (bb, id, nav_highlight_flags );
3650+ ImGuiNavRenderCursorFlags flags = ImGuiNavRenderCursorFlags_Compact | ImGuiNavRenderCursorFlags_NoRounding ;
3651+ if (is_multi_select) flags |= ImGuiNavRenderCursorFlags_AlwaysDraw ; // Always show the nav rectangle
3652+ RenderNavCursor (bb, id, flags );
36533653 }
36543654 }
36553655
@@ -3663,7 +3663,7 @@ bool IGFD::KeyExplorerFeature::m_FlashableSelectable(const char* label, bool sel
36633663 if (is_visible) RenderTextClipped (text_min, text_max, label, NULL , &label_size, style.SelectableTextAlign , &bb);
36643664
36653665 // Automatically close popups
3666- if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_NoAutoClosePopups) && (g.LastItemData .InFlags & ImGuiItemFlags_AutoClosePopups)) CloseCurrentPopup ();
3666+ if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_NoAutoClosePopups) && (g.LastItemData .ItemFlags & ImGuiItemFlags_AutoClosePopups)) CloseCurrentPopup ();
36673667
36683668 if (disabled_item && !disabled_global) EndDisabled ();
36693669
0 commit comments