Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TextInput: A couple of fixes #6750

Merged
merged 1 commit into from
Oct 31, 2023
+11 −2
Merged

TextInput: A couple of fixes #6750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion Source/DiabloUI/text_input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ bool HandleInputEvent(const SDL_Event &event, TextInputState &state,
case SDL_KEYDOWN: {
switch (event.key.keysym.sym) {
#ifndef USE_SDL1
case SDLK_a:
if (isCtrl) {
state.setCursorToStart();
state.setSelectCursorToEnd();
}
return true;
case SDLK_c:
if (isCtrl) {
const std::string selectedText { state.selectedText() };
Expand Down Expand Up @@ -92,8 +98,11 @@ bool HandleInputEvent(const SDL_Event &event, TextInputState &state,
typeFn(utf8);
return true;
}
#else
// Mark events that will also trigger SDL_TEXTINPUT as handled.
return !isCtrl && !isAlt
&& event.key.keysym.sym >= SDLK_SPACE && event.key.keysym.sym <= SDLK_z;
#endif
return false;
}
#ifndef USE_SDL1
case SDL_TEXTINPUT:
Expand Down
2 changes: 1 addition & 1 deletion Source/DiabloUI/text_input.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class TextInputState {

void erase(size_t pos, size_t len)
{
std::memmove(&buf_[pos], &buf_[pos + len], len);
std::memmove(&buf_[pos], &buf_[pos + len], len_ - (pos + len));
len_ -= len;
buf_[len_] = '\0';
}
Expand Down
Loading