mirror/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-12-20 12:09:32 -06:00
Code Issues Packages Projects Releases 4 Wiki Activity

message_window: fix input and button guide inconsistencies

Browse Source
This commit is contained in:
Hyper
2025-01-29 02:38:41 +00:00
parent f6e43761b7
commit 4fd08efa6d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
UnleashedRecomp/ui/message_window.cpp
View File

@@ -147,9 +147,8 @@ public:
} }
} }
} }
}; }
g_sdlEventListenerForMessageWindow;
static SDLEventListenerForMessageWindow g_eventListener;
bool DrawContainer(float appearTime, ImVec2 centre, ImVec2 max, bool isForeground = true) bool DrawContainer(float appearTime, ImVec2 centre, ImVec2 max, bool isForeground = true)
{ {
@@ -382,12 +381,15 @@ void MessageWindow::Draw()
} }
if (scrollUp || scrollDown) if (scrollUp || scrollDown)
{
Game_PlaySound("sys_actstg_pausecursor"); Game_PlaySound("sys_actstg_pausecursor");
g_joypadAxis = {};
}
g_upWasHeld = upIsHeld; g_upWasHeld = upIsHeld;
g_downWasHeld = downIsHeld; g_downWasHeld = downIsHeld;
if (isController) if (isController || (isKeyboard && App::s_isInit))
{ {
std::array<Button, 2> buttons = std::array<Button, 2> buttons =
{ {
@@ -397,7 +399,7 @@ void MessageWindow::Draw()
ButtonGuide::Open(buttons); ButtonGuide::Open(buttons);
} }
else if (!App::s_isInit) // Only display keyboard prompt during installer. else // Only display keyboard prompt during installer.
{ {
ButtonGuide::Open(Button(Localise("Common_Select"), EButtonIcon::Enter)); ButtonGuide::Open(Button(Localise("Common_Select"), EButtonIcon::Enter));
} }