mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Part of #15589: Make numpad enter able to confirm input

Browse source
This commit is contained in:
Meehoi 2022-09-26 01:33:02 +07:00 committed by GitHub
parent ae0f548d97
commit 61d74eaa4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
distribution/changelog.txt
View file

@ -16,7 +16,8 @@
- Feature: [objects#205] Add additional glass roofs.
- Feature: [objects#209] Add the Steel Roller Coaster train and 2-across Inverted Train from RollerCoaster Tycoon 1.
- Improved: [#15358] Park and scenario names can now contain up to 128 characters.
- Improved: [#16819] Don't prompt to 'Save game as' when saving a loaded saved game (excepting autosaves).
- Improved: [#15589] Numpad Enter can now be used to close text input.
- Improved: [#16819] Don't prompt to “Save game as” when saving a loaded saved game (excepting autosaves).
- Improved: [#16840] Add support for rectangular heightmaps.
- Improved: [#17575] You can now search for Authors in Object Selection.
- Improved: [#17806] Added warning when using RCT1 objects without RCT1 linked.

5
src/openrct2-ui/windows/TextInput.cpp
View file

@ -7,6 +7,7 @@
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#include <SDL_keycode.h>
#include <algorithm>
#include <iterator>
#include <openrct2-ui/interface/Widget.h>
@ -408,13 +409,13 @@ void WindowTextInputOpen(
WindowTextInputRawOpen(call_w, call_widget, title, description, descriptionArgs, existingText.c_str(), maxLength);
}
void WindowTextInputKey(rct_window* w, char keychar)
void WindowTextInputKey(rct_window* w, uint32_t keycode)
{
const auto wndNumber = w->number;
const auto wndClass = w->classification;
// If the return button is pressed stop text input
if (keychar == '\r')
if (keycode == SDLK_RETURN || keycode == SDLK_KP_ENTER)
{
if (w->classification == WindowClass::Textinput)
{

2
src/openrct2-ui/windows/Window.h
View file

@ -149,7 +149,7 @@ rct_window* WindowNetworkStatusOpen(const char* text, close_callback onClose);
rct_window* WindowNetworkStatusOpenPassword();
void WindowNetworkStatusClose();
void WindowTextInputKey(rct_window* w, char keychar);
void WindowTextInputKey(rct_window* w, uint32_t keycode);
void WindowTextInputOpen(
rct_window* call_w, WidgetIndex call_widget, StringId title, StringId description, const Formatter& descriptionArgs,
StringId existing_text, uintptr_t existing_args, int32_t maxLength);