guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

Fix Super Mario 3D World

Browse Source
This commit is contained in:
Stossy11 2025-03-09 13:22:18 +11:00
parent 172f364f62
commit 93af19e200
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

28
src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
View File

@ -109,7 +109,7 @@ namespace Ryujinx.HLE.HOS.Applets
_npads.NpadButtonDownEvent += HandleNpadButtonDownEvent; _npads.NpadButtonDownEvent += HandleNpadButtonDownEvent;
_npads.NpadButtonUpEvent += HandleNpadButtonUpEvent; _npads.NpadButtonUpEvent += HandleNpadButtonUpEvent;
_keyboardRenderer = new SoftwareKeyboardRenderer(_device.UIHandler.HostUITheme); // _keyboardRenderer = new SoftwareKeyboardRenderer(_device.UIHandler.HostUITheme);
} }
return ResultCode.Success; return ResultCode.Success;
@ -177,9 +177,9 @@ namespace Ryujinx.HLE.HOS.Applets
{ {
_npads?.Update(); _npads?.Update();
_keyboardRenderer?.SetSurfaceInfo(surfaceInfo); // _keyboardRenderer?.SetSurfaceInfo(surfaceInfo);
return _keyboardRenderer?.DrawTo(destination, position) ?? false; return true; // _keyboardRenderer?.DrawTo(destination, position) ?? false;
} }
@ -470,7 +470,7 @@ namespace Ryujinx.HLE.HOS.Applets
if (updateText) if (updateText)
{ {
_dynamicTextInputHandler.SetText(_textValue, _cursorBegin); _dynamicTextInputHandler.SetText(_textValue, _cursorBegin);
_keyboardRenderer.UpdateTextState(_textValue, _cursorBegin, _cursorBegin, null, null); // _keyboardRenderer.UpdateTextState(_textValue, _cursorBegin, _cursorBegin, null, null);
} }
if ((newCalc.Flags & KeyboardCalcFlags.MustShow) != 0) if ((newCalc.Flags & KeyboardCalcFlags.MustShow) != 0)
@ -515,8 +515,8 @@ namespace Ryujinx.HLE.HOS.Applets
_dynamicTextInputHandler.TextProcessingEnabled = true; _dynamicTextInputHandler.TextProcessingEnabled = true;
_keyboardRenderer.UpdateCommandState(null, null, true); // _keyboardRenderer.UpdateCommandState(null, null, true);
_keyboardRenderer.UpdateTextState(null, null, null, null, true); // _keyboardRenderer.UpdateTextState(null, null, null, null, true);
} }
private void DeactivateFrontend() private void DeactivateFrontend()
@ -534,7 +534,7 @@ namespace Ryujinx.HLE.HOS.Applets
{ {
Logger.Debug?.Print(LogClass.ServiceAm, "Destroying software keyboard frontend"); Logger.Debug?.Print(LogClass.ServiceAm, "Destroying software keyboard frontend");
_keyboardRenderer?.Dispose(); // _keyboardRenderer?.Dispose();
_keyboardRenderer = null; _keyboardRenderer = null;
if (_dynamicTextInputHandler != null) if (_dynamicTextInputHandler != null)
@ -568,8 +568,8 @@ namespace Ryujinx.HLE.HOS.Applets
_dynamicTextInputHandler.TextProcessingEnabled = typingEnabled; _dynamicTextInputHandler.TextProcessingEnabled = typingEnabled;
_keyboardRenderer.UpdateTextState(null, null, null, null, typingEnabled); // _keyboardRenderer.UpdateTextState(null, null, null, null, typingEnabled);
_keyboardRenderer.UpdateCommandState(null, null, controllerEnabled); // _keyboardRenderer.UpdateCommandState(null, null, controllerEnabled);
} }
} }
} }
@ -596,7 +596,7 @@ namespace Ryujinx.HLE.HOS.Applets
_textValue = text; _textValue = text;
_cursorBegin = cursorBegin; _cursorBegin = cursorBegin;
_keyboardRenderer.UpdateTextState(text, cursorBegin, cursorEnd, overwriteMode, null); // _keyboardRenderer.UpdateTextState(text, cursorBegin, cursorEnd, overwriteMode, null);
PushUpdatedState(text, cursorBegin, KeyboardResult.NotSet); PushUpdatedState(text, cursorBegin, KeyboardResult.NotSet);
} }
@ -614,10 +614,10 @@ namespace Ryujinx.HLE.HOS.Applets
switch (button) switch (button)
{ {
case NpadButton.A: case NpadButton.A:
_keyboardRenderer.UpdateCommandState(_canAcceptController, null, null); // _keyboardRenderer.UpdateCommandState(_canAcceptController, null, null);
break; break;
case NpadButton.B: case NpadButton.B:
_keyboardRenderer.UpdateCommandState(null, _canAcceptController, null); // _keyboardRenderer.UpdateCommandState(null, _canAcceptController, null);
break; break;
} }
} }
@ -633,11 +633,11 @@ namespace Ryujinx.HLE.HOS.Applets
{ {
case NpadButton.A: case NpadButton.A:
result = KeyboardResult.Accept; result = KeyboardResult.Accept;
_keyboardRenderer.UpdateCommandState(false, null, null); // _keyboardRenderer.UpdateCommandState(false, null, null);
break; break;
case NpadButton.B: case NpadButton.B:
result = KeyboardResult.Cancel; result = KeyboardResult.Cancel;
_keyboardRenderer.UpdateCommandState(null, false, null); // _keyboardRenderer.UpdateCommandState(null, false, null);
break; break;
} }

4
src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRenderer.cs
View File

@ -25,8 +25,8 @@ namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
{ {
_renderer = new SoftwareKeyboardRendererBase(uiTheme); _renderer = new SoftwareKeyboardRendererBase(uiTheme);
StartTextBoxBlinker(_textBoxBlinkTimedAction, _state, _stateLock); // StartTextBoxBlinker(_textBoxBlinkTimedAction, _state, _stateLock);
StartRenderer(_renderAction, _renderer, _state, _stateLock); // StartRenderer(_renderAction, _renderer, _state, _stateLock);
} }
private static void StartTextBoxBlinker(TimedAction timedAction, SoftwareKeyboardUIState state, object stateLock) private static void StartTextBoxBlinker(TimedAction timedAction, SoftwareKeyboardUIState state, object stateLock)