Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 15:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue where SDL_StartTextInput() was sometimes set when not actually inputting any text

Browse source
This commit is contained in:
Leon Styhre 2023-07-20 16:03:59 +02:00
parent bd591a74cb
commit be2b761356
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
es-core/src/InputManager.cpp
View file

@ -59,6 +59,7 @@ void InputManager::init()
SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER); SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
SDL_GameControllerEventState(SDL_ENABLE); SDL_GameControllerEventState(SDL_ENABLE);
SDL_StopTextInput();
if (!Utils::FileSystem::exists(getConfigPath())) { if (!Utils::FileSystem::exists(getConfigPath())) {
LOG(LogInfo) << "No input configuration file found, default mappings will be applied"; LOG(LogInfo) << "No input configuration file found, default mappings will be applied";

6
es-core/src/components/TextEditComponent.cpp
View file

@ -37,6 +37,12 @@ TextEditComponent::TextEditComponent()
setSize(4096, mFont->getHeight() + (TEXT_PADDING_VERT * mRenderer->getScreenHeightModifier())); setSize(4096, mFont->getHeight() + (TEXT_PADDING_VERT * mRenderer->getScreenHeightModifier()));
} }
TextEditComponent::~TextEditComponent()
{
// Always disable text input when destroying this component.
SDL_StopTextInput();
}
void TextEditComponent::onFocusGained() void TextEditComponent::onFocusGained()
{ {
mFocused = true; mFocused = true;

1
es-core/src/components/TextEditComponent.h
View file

@ -21,6 +21,7 @@ class TextEditComponent : public GuiComponent
{ {
public: public:
TextEditComponent(); TextEditComponent();
~TextEditComponent();
void textInput(const std::string& text, const bool pasting = false) override; void textInput(const std::string& text, const bool pasting = false) override;
bool input(InputConfig* config, Input input) override; bool input(InputConfig* config, Input input) override;