mirror/UnleashedRecomp-hedge-dev
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-25 12:58:18 -05:00
Code Issues Packages Projects Releases 4 Wiki Activity

Add back button functionality to the installer. (#279)

Browse Source 
* Add back button functionality to the installer.

* Nuclear exits.

* Adjust error code.

* Rework waiting time into the installer process instead.

* Extra waiting time during quitting.

* Restore button max widths.

* button_guide: set up Esc key texture

* Update installer_wizard.cpp

* Update resources submodule

* installer_wizard: decrease nav button margin

---------

Co-authored-by: Hyper <34012267+hyperbx@users.noreply.github.com>
This commit is contained in:
Darío
2025-02-05 16:36:30 -03:00
committed by GitHub
parent b68dbec612
commit ef51f04d4f
10 changed files with 368 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnleashedRecomp/ui/message_window.cpp
+20 -9
View File
@@ -296,7 +296,7 @@ void MessageWindow::Draw()
textY += Scale(lines.size() % 2 == 0 ? 1.5f : 8.0f);
}
bool isController = hid::IsInputDeviceController();
bool isKeyboard = hid::g_inputDevice == hid::EInputDevice::Keyboard;
@@ -397,20 +397,25 @@ void MessageWindow::Draw()
g_upWasHeld = upIsHeld;
g_downWasHeld = downIsHeld;
if (isController || (isKeyboard && App::s_isInit))
EButtonIcon selectIcon = EButtonIcon::A;
EButtonIcon backIcon = EButtonIcon::B;
if (isController || isKeyboard)
{
if (isKeyboard && !App::s_isInit)
{
// Only display keyboard prompt during installer.
selectIcon = EButtonIcon::Enter;
backIcon = EButtonIcon::Escape;
}
std::array<Button, 2> buttons =
{
Button(Localise("Common_Select"), EButtonIcon::A),
Button(Localise("Common_Back"), EButtonIcon::B),
Button(Localise("Common_Select"), selectIcon),
Button(Localise("Common_Back"), backIcon),
};
ButtonGuide::Open(buttons);
}
else // Only display keyboard prompt during installer.
{
ButtonGuide::Open(Button(Localise("Common_Select"), EButtonIcon::Enter));
}
if (g_isDeclined)
{
@@ -448,7 +453,13 @@ void MessageWindow::Draw()
}
}
ButtonGuide::Open(Button(Localise("Common_Select"), EButtonIcon::LMB));
std::array<Button, 2> buttons =
{
Button(Localise("Common_Select"), EButtonIcon::LMB),
Button(Localise("Common_Back"), EButtonIcon::Escape),
};
ButtonGuide::Open(buttons);
}
if (g_selectedRowIndex != -1 && g_isAccepted)