This commit is contained in:
GabsPuNs
2026-05-14 21:52:21 -04:00
parent 1b2f5c6fe8
commit f8a2d644f5
291 changed files with 7363 additions and 18368 deletions

View File

@@ -952,15 +952,8 @@ void UIController::tickInput()
{
// ButtonList manages focus internally via Flash —
// pass mouse coords so it can highlight the right item.
S32 adjustedMouseY = static_cast<S32>(sceneMouseY);
if (pScene->getSceneType() == eUIScene_LoadCreateJoinMenu)
{
const S32 visibleRows = 7.0f;
const F32 rowHeight = (visibleRows > 0.0f) ? (static_cast<F32>(ch) / visibleRows) : 0.0f;
if (rowHeight > 0.0f)
adjustedMouseY -= rowHeight;
}
static_cast<UIControl_ButtonList *>(ctrl)->SetTouchFocus(static_cast<S32>(sceneMouseX), static_cast<S32>(adjustedMouseY), false);
static_cast<UIControl_ButtonList*>(ctrl)->SetTouchFocus(
static_cast<S32>(sceneMouseX), static_cast<S32>(sceneMouseY), false);
hitControlId = -1;
hitArea = INT_MAX;
hitCtrl = nullptr;
@@ -1919,7 +1912,7 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
#if 0 // Disable since we don't use this
// If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now
// display this message the first 3 times
if((scene==eUIScene_LoadCreateJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
if((scene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
{
scene=eUIScene_NewUpdateMessage;
bSeenUpdateTextThisSession=true;
@@ -1934,7 +1927,6 @@ bool UIController::NavigateToScene(int iPad, EUIScene scene, void *initData, EUI
case eUIScene_PauseMenu:
case eUIScene_Crafting2x2Menu:
case eUIScene_Crafting3x3Menu:
case eUIScene_ClassicCraftingMenu:
case eUIScene_FurnaceMenu:
case eUIScene_ContainerMenu:
case eUIScene_LargeContainerMenu:
@@ -2141,7 +2133,7 @@ size_t UIController::RegisterForCallbackId(UIScene *scene)
{
EnterCriticalSection(&m_registeredCallbackScenesCS);
size_t newId = GetTickCount64();
newId &= 0xFFFFFF; // Chop off the top byte, we don't need any more accuracy than that
newId &= 0xFFFFFF; // Chop off the top BYTE, we don't need any more accuracy than that
newId |= (scene->getSceneType() << 24); // Add in the scene's type to help keep this unique
m_registeredCallbackScenes[newId] = scene;
LeaveCriticalSection(&m_registeredCallbackScenesCS);