@@ -3579,7 +3579,6 @@ namespace IGFD
35793579 // We use NoHoldingActiveID on menus so user can click and _hold_ on a menu then drag to browse child entries
35803580 ImGuiButtonFlags button_flags = 0 ;
35813581 if (flags & ImGuiSelectableFlags_NoHoldingActiveID) { button_flags |= ImGuiButtonFlags_NoHoldingActiveId; }
3582- if (flags & ImGuiSelectableFlags_NoSetKeyOwner) { button_flags |= ImGuiButtonFlags_NoSetKeyOwner; }
35833582 if (flags & ImGuiSelectableFlags_SelectOnClick) { button_flags |= ImGuiButtonFlags_PressedOnClick; }
35843583 if (flags & ImGuiSelectableFlags_SelectOnRelease) { button_flags |= ImGuiButtonFlags_PressedOnRelease; }
35853584 if (flags & ImGuiSelectableFlags_AllowDoubleClick) { button_flags |= ImGuiButtonFlags_PressedOnClickRelease | ImGuiButtonFlags_PressedOnDoubleClick; }
@@ -3589,26 +3588,6 @@ namespace IGFD
35893588 bool hovered, held;
35903589 bool pressed = ButtonBehavior (bb, id, &hovered, &held, button_flags);
35913590
3592- // Auto-select when moved into
3593- // - This will be more fully fleshed in the range-select branch
3594- // - This is not exposed as it won't nicely work with some user side handling of shift/control
3595- // - We cannot do 'if (g.NavJustMovedToId != id) { selected = false; pressed = was_selected; }' for two reasons
3596- // - (1) it would require focus scope to be set, need exposing PushFocusScope() or equivalent (e.g. BeginSelection() calling PushFocusScope())
3597- // - (2) usage will fail with clipped items
3598- // The multi-select API aim to fix those issues, e.g. may be replaced with a BeginSelection() API.
3599- if ((flags & ImGuiSelectableFlags_SelectOnNav) && g.NavJustMovedToId != 0 && g.NavJustMovedToFocusScopeId == g.CurrentFocusScopeId )
3600- if (g.NavJustMovedToId == id)
3601- selected = pressed = true ;
3602-
3603- // Update NavId when clicking or when Hovering (this doesn't happen on most widgets), so navigation can be resumed with gamepad/keyboard
3604- if (pressed || (hovered && (flags & ImGuiSelectableFlags_SetNavIdOnHover)))
3605- {
3606- if (!g.NavDisableMouseHover && g.NavWindow == window && g.NavLayer == window->DC .NavLayerCurrent )
3607- {
3608- SetNavID (id, window->DC .NavLayerCurrent , g.CurrentFocusScopeId , WindowRectAbsToRel (window, bb)); // (bb == NavRect)
3609- g.NavDisableHighlight = true ;
3610- }
3611- }
36123591 if (pressed)
36133592 MarkItemEdited (id);
36143593
0 commit comments