Fixed ButtonList and TexturePackList issue

This commit is contained in:
ACL 2026-04-16 20:44:13 +02:00
parent 5f65864000
commit fe7cd25b85

View file

@ -955,7 +955,7 @@ void UIController::tickInput()
static_cast<S32>(sceneMouseX), static_cast<S32>(sceneMouseY), false); static_cast<S32>(sceneMouseX), static_cast<S32>(sceneMouseY), false);
hitControlId = -1; hitControlId = -1;
hitArea = INT_MAX; hitArea = INT_MAX;
hitCtrl = NULL; hitCtrl = ctrl;
break; // ButtonList takes priority break; // ButtonList takes priority
} }
if (type == UIControl::eTexturePackList) if (type == UIControl::eTexturePackList)
@ -968,7 +968,7 @@ void UIController::tickInput()
m_bMouseHoverHorizontalList = true; m_bMouseHoverHorizontalList = true;
hitControlId = -1; hitControlId = -1;
hitArea = INT_MAX; hitArea = INT_MAX;
hitCtrl = NULL; hitCtrl = ctrl;
break; break;
} }
S32 area = cw * ch; S32 area = cw * ch;
@ -1005,7 +1005,7 @@ void UIController::tickInput()
} }
} }
if (hitCtrl && (hitCtrl->getControlType() == UIControl::eButton || hitCtrl->getControlType() == UIControl::eCheckBox || hitCtrl->getControlType() == UIControl::eButtonList || hitCtrl->getControlType() == UIControl::eSaveList)) if (hitCtrl && (hitCtrl->getControlType() == UIControl::eButton || hitCtrl->getControlType() == UIControl::eCheckBox || hitCtrl->getControlType() == UIControl::eButtonList))
g_KBMInput.SetCursorIcon(MAKEINTRESOURCEW(IDC_HAND)); g_KBMInput.SetCursorIcon(MAKEINTRESOURCEW(IDC_HAND));
else if (hitCtrl && hitCtrl->getControlType() == UIControl::eSlider || hitCtrl && hitCtrl->getControlType() == UIControl::eTexturePackList) else if (hitCtrl && hitCtrl->getControlType() == UIControl::eSlider || hitCtrl && hitCtrl->getControlType() == UIControl::eTexturePackList)
g_KBMInput.SetCursorIcon(MAKEINTRESOURCEW(IDC_SIZEWE)); g_KBMInput.SetCursorIcon(MAKEINTRESOURCEW(IDC_SIZEWE));