backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix mouse hover selecting wrong buttons from the third onward

Browse source 
The hover code was doing a redundant second hit-test against Iggy
focusable object bounds after the C++ control bounds had already
identified the correct control. Iggy focusable bounds are wider than
the actual visible buttons and overlap vertically, so the "pick
largest x0" heuristic would match focusables belonging to earlier
buttons when hovering the right side of buttons 3+.

Replaced the IggyPlayerGetFocusableObjects path with a direct
SetFocusToElement call using the already-correct hitControlId from
the C++ hit-test, same approach the click path uses in
handleMouseClick. Also switched the overlap tiebreaker from "largest
x0" to smallest area, consistent with how clicks resolve overlapping
controls. TextInput is excluded from hover focus to avoid showing
the caret on mere mouse-over (its Iggy focus is set on click).
This commit is contained in:
MrTheShy 2026-03-06 05:23:52 +01:00
parent 90b5c2d51a
commit 9432005056
1 changed files with 12 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Minecraft.Client/Common/UI/UIController.cpp
View file

@ -860,7 +860,8 @@ void UIController::tickInput()
if (controls)
{
int hitControlId = -1;
S32 hitCx = -1;
S32 hitArea = INT_MAX;
bool hitIsTextInput = false;
for (size_t i = 0; i < controls->size(); ++i)
{
UIControl *ctrl = (*controls)[i];
@ -896,56 +897,25 @@ void UIController::tickInput()
((UIControl_ButtonList *)ctrl)->SetTouchFocus(
(S32)sceneMouseX, (S32)sceneMouseY, false);
hitControlId = -1;
hitCx = -1;
hitArea = INT_MAX;
break; // ButtonList takes priority
}
else if (cx > hitCx)
S32 area = cw * ch;
if (area < hitArea)
{
// When multiple controls overlap (e.g. debug scenes
// with side-by-side TextInputs reporting full width),
// pick the one whose left edge is closest to mouse X.
hitControlId = ctrl->getId();
hitCx = cx;
hitArea = area;
hitIsTextInput = (type == UIControl::eTextInput);
}
}
}
if (hitControlId >= 0 && pScene->getControlFocus() != hitControlId)
// Set focus directly via Flash AS, matching the click path.
// Skip TextInput — its Iggy focus is set on click (below)
// to avoid showing the caret on mere hover.
if (hitControlId >= 0 && !hitIsTextInput && pScene->getControlFocus() != hitControlId)
{
// Set focus via Iggy's internal focus system so that
// action dispatch (ACTION_MENU_OK) targets the right
// control. SetFocusToElement calls Flash's AS SetFocus
// which triggers full focus behavior (including caret
// visibility on TextInputs), so prefer IggyPlayerSetFocusRS.
Iggy *movie = pScene->getMovie();
IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
IggyFocusableObject focusables[64];
S32 numFocusables = 0;
IggyPlayerGetFocusableObjects(movie, &currentFocus, focusables, 64, &numFocusables);
// Iggy focusable bounds may overlap (same wide-width issue
// as C++ bounds). Pick the one with largest x0 <= mouseX.
bool iggyFocusSet = false;
S32 bestFocusX0 = -1;
S32 bestFocusIdx = -1;
for (S32 fi = 0; fi < numFocusables && fi < 64; ++fi)
{
if (sceneMouseX >= focusables[fi].x0 && sceneMouseX <= focusables[fi].x1 &&
sceneMouseY >= focusables[fi].y0 && sceneMouseY <= focusables[fi].y1)
{
if (focusables[fi].x0 > bestFocusX0)
{
bestFocusX0 = focusables[fi].x0;
bestFocusIdx = fi;
}
}
}
if (bestFocusIdx >= 0)
{
IggyPlayerSetFocusRS(movie, focusables[bestFocusIdx].object, 0);
iggyFocusSet = true;
}
if (!iggyFocusSet)
pScene->SetFocusToElement(hitControlId);
pScene->SetFocusToElement(hitControlId);
}
}
}