Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-09 19:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Reverse left/right keypress when editing RTL text. (#12711)

Browse Source 
When editing RTL text, pressing left should increment instead of decrement the character position to move left, and vice versa.
This commit is contained in:
Peter Nelson 2024-05-23 21:34:05 +01:00 committed by GitHub
parent f87c6990b0
commit 5fefe0b61f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/textbuf.cpp
View File

@ -322,6 +322,40 @@ void Textbuf::UpdateMarkedText()
}
}
/**
* Move to previous character position.
* @param what Move ITER_CHARACTER or ITER_WORD.
* @return true iff able to move.
*/
bool Textbuf::MovePrev(StringIterator::IterType what)
{
if (this->caretpos == 0) return false;
size_t pos = this->char_iter->Prev(what);
if (pos == StringIterator::END) return true;
this->caretpos = static_cast<uint16_t>(pos);
this->UpdateCaretPosition();
return true;
}
/**
* Move to next character position.
* @param what Move ITER_CHARACTER or ITER_WORD.
* @return true iff able to move.
*/
bool Textbuf::MoveNext(StringIterator::IterType what)
{
if (this->caretpos >= this->bytes - 1) return false;
size_t pos = this->char_iter->Next(what);
if (pos == StringIterator::END) return true;
this->caretpos = static_cast<uint16_t>(pos);
this->UpdateCaretPosition();
return true;
}
/**
* Handle text navigation with arrow keys left/right.
* This defines where the caret will blink and the next character interaction will occur
@ -333,26 +367,14 @@ bool Textbuf::MovePos(uint16_t keycode)
switch (keycode) {
case WKC_LEFT:
case WKC_CTRL | WKC_LEFT: {
if (this->caretpos == 0) break;
size_t pos = this->char_iter->Prev(keycode & WKC_CTRL ? StringIterator::ITER_WORD : StringIterator::ITER_CHARACTER);
if (pos == StringIterator::END) return true;
this->caretpos = (uint16_t)pos;
this->UpdateCaretPosition();
return true;
auto move_type = (keycode & WKC_CTRL) != 0 ? StringIterator::ITER_WORD : StringIterator::ITER_CHARACTER;
return (_current_text_dir == TD_LTR) ? this->MovePrev(move_type) : this->MoveNext(move_type);
}
case WKC_RIGHT:
case WKC_CTRL | WKC_RIGHT: {
if (this->caretpos >= this->bytes - 1) break;
size_t pos = this->char_iter->Next(keycode & WKC_CTRL ? StringIterator::ITER_WORD : StringIterator::ITER_CHARACTER);
if (pos == StringIterator::END) return true;
this->caretpos = (uint16_t)pos;
this->UpdateCaretPosition();
return true;
auto move_type = (keycode & WKC_CTRL) != 0 ? StringIterator::ITER_WORD : StringIterator::ITER_CHARACTER;
return (_current_text_dir == TD_LTR) ? this->MoveNext(move_type) : this->MovePrev(move_type);
}
case WKC_HOME:

3
src/textbuf_type.h
View File

@ -72,6 +72,9 @@ private:
bool CanDelChar(bool backspace);
bool MovePrev(StringIterator::IterType what);
bool MoveNext(StringIterator::IterType what);
void DeleteText(uint16_t from, uint16_t to, bool update);
void UpdateStringIter();