mirror of
https://github.com/hedge-dev/UnleashedRecomp
synced 2026-09-03 18:43:35 -04:00
CTitleStateMenu: implemented rebooting into installer
This commit is contained in:
@@ -63,7 +63,7 @@ std::tuple<std::tuple<ImVec2, ImVec2>, GuestTexture*> GetButtonIcon(EButtonIcon
|
||||
std::tuple<ImVec2, ImVec2> btn;
|
||||
GuestTexture* texture;
|
||||
|
||||
auto isPlayStation = g_isAppInit
|
||||
auto isPlayStation = App::s_isInit
|
||||
? Config::ControllerIcons == EControllerIcons::PlayStation
|
||||
: hid::detail::g_inputDevice == hid::detail::EInputDevice::PlayStation;
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ public:
|
||||
{
|
||||
case SDL_KEYDOWN:
|
||||
{
|
||||
if (g_isAppInit)
|
||||
if (App::s_isInit)
|
||||
break;
|
||||
|
||||
switch (event->key.keysym.scancode)
|
||||
@@ -93,7 +93,7 @@ public:
|
||||
|
||||
case SDL_MOUSEBUTTONDOWN:
|
||||
{
|
||||
if (g_isAppInit)
|
||||
if (App::s_isInit)
|
||||
break;
|
||||
|
||||
g_isAccepted = true;
|
||||
@@ -273,8 +273,8 @@ void MessageWindow::Draw()
|
||||
auto textMarginX = Scale(37);
|
||||
auto textMarginY = Scale(45);
|
||||
|
||||
bool isController = g_isAppInit ? true : hid::detail::IsInputDeviceController();
|
||||
bool isKeyboard = g_isAppInit ? false : hid::detail::g_inputDevice == hid::detail::EInputDevice::Keyboard;
|
||||
bool isController = App::s_isInit ? true : hid::detail::IsInputDeviceController();
|
||||
bool isKeyboard = App::s_isInit ? false : hid::detail::g_inputDevice == hid::detail::EInputDevice::Keyboard;
|
||||
|
||||
if (DrawContainer(g_appearTime, centre, { textSize.x / 2 + textMarginX, textSize.y / 2 + textMarginY }, !g_isControlsVisible))
|
||||
{
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include "sdl_listener.h"
|
||||
#include <user/config.h>
|
||||
#include <SDL_syswm.h>
|
||||
#include <app.h>
|
||||
|
||||
bool m_isFullscreenKeyReleased = true;
|
||||
bool m_isResizing = false;
|
||||
@@ -18,7 +19,7 @@ int Window_OnSDLEvent(void*, SDL_Event* event)
|
||||
{
|
||||
case SDL_QUIT:
|
||||
Config::Save();
|
||||
ExitProcess(0);
|
||||
App::Exit();
|
||||
break;
|
||||
|
||||
case SDL_KEYDOWN:
|
||||
|
||||
Reference in New Issue
Block a user