mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[client,sdl] handle dialog on key up event 

Handle keyboard input dialog status change on key up event. If handled
on key down event the dialog closes and the key up event is handled on
the next SDL event queue (usually connection dialog cancel)
Fixes #10133
This commit is contained in:
Armin Novak 2024-04-24 09:21:04 +02:00 committed by akallabeth
parent 3fe9363592
commit c172713c41
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/SDL/dialogs/sdl_connection_dialog.cpp
View File

@ -49,7 +49,11 @@ SDLConnectionDialog::~SDLConnectionDialog()
bool SDLConnectionDialog::visible() const
{
return _window && _renderer;
if (!_window || !_renderer)
return false;
auto flags = SDL_GetWindowFlags(_window);
return (flags & (SDL_WINDOW_HIDDEN | SDL_WINDOW_MINIMIZED)) == 0;
}
bool SDLConnectionDialog::setTitle(const char* fmt, ...)

9
client/SDL/dialogs/sdl_input_widgets.cpp
View File

@ -164,10 +164,7 @@ int SdlInputWidgetList::run(std::vector<std::string>& result)
{
auto it = std::remove(pressed.begin(), pressed.end(), event.key.keysym.sym);
pressed.erase(it, pressed.end());
}
break;
case SDL_KEYDOWN:
pressed.push_back(event.key.keysym.sym);
switch (event.key.keysym.sym)
{
case SDLK_BACKSPACE:
@ -210,6 +207,10 @@ int SdlInputWidgetList::run(std::vector<std::string>& result)
default:
break;
}
}
break;
case SDL_KEYDOWN:
pressed.push_back(event.key.keysym.sym);
break;
case SDL_TEXTINPUT:
{