Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UI button staying focused on mouse-out + controller snap (#773)

Browse Source
This commit is contained in:
Lrxh
2026-03-07 01:39:55 +01:00
committed by GitHub
parent 55be6447e3
commit 2f614a52c2
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Minecraft.Client/Common/UI/UIController.cpp
View File

@@ -865,6 +865,7 @@ void UIController::tickInput()
int hitControlId = -1;
S32 hitArea = INT_MAX;
UIControl *hitCtrl = NULL;
bool hitAny = false;
for (size_t i = 0; i < controls->size(); ++i)
{
UIControl *ctrl = (*controls)[i];
@@ -906,7 +907,8 @@ void UIController::tickInput()
hitControlId = -1;
hitArea = INT_MAX;
hitCtrl = NULL;
break; // ButtonList takes priority
hitAny = true;
break; // ButtonList takes priority
}
if (type == UIControl::eTexturePackList)
{
@@ -919,6 +921,7 @@ void UIController::tickInput()
hitControlId = -1;
hitArea = INT_MAX;
hitCtrl = NULL;
hitAny = true;
break;
}
S32 area = cw * ch;
@@ -927,6 +930,7 @@ void UIController::tickInput()
hitControlId = ctrl->getId();
hitArea = area;
hitCtrl = ctrl;
hitAny = true;
if (type == UIControl::eSlider)
m_bMouseHoverHorizontalList = true;
}
@@ -954,6 +958,19 @@ void UIController::tickInput()
}
}
}
else if (!hitAny && !pScene->isDirectEditBlocking())
{
// Mouse moved away from all controls — clear focus if set
Iggy *movie = pScene->getMovie();
IggyFocusHandle currentFocus = IGGY_FOCUS_NULL;
IggyFocusableObject focusables[64];
S32 numFocusables = 0;
IggyPlayerGetFocusableObjects(movie, &currentFocus, focusables, 64, &numFocusables);
if (currentFocus != IGGY_FOCUS_NULL)
{
IggyPlayerSetFocusRS(movie, IGGY_FOCUS_NULL, 0);
}
}
}
}