Merge branch 'main' into debugging-client
This commit is contained in:
commit
8a3ad8c728
@ -486,7 +486,7 @@ void TextBox::erase(size_t start, size_t length) {
|
|||||||
setCaret(caret - length);
|
setCaret(caret - length);
|
||||||
}
|
}
|
||||||
auto left = input.substr(0, start);
|
auto left = input.substr(0, start);
|
||||||
auto right = input.substr(end);
|
auto right = end >= input.length() ? L"" : input.substr(end);
|
||||||
input = left + right;
|
input = left + right;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1049,11 +1049,11 @@ void TextBox::keyPressed(Keycode key) {
|
|||||||
resetSelection();
|
resetSelection();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (key == Keycode::Z) {
|
if (editable && key == Keycode::Z) {
|
||||||
historian->undo();
|
historian->undo();
|
||||||
refreshSyntax();
|
refreshSyntax();
|
||||||
}
|
}
|
||||||
if (key == Keycode::Y) {
|
if (editable && key == Keycode::Y) {
|
||||||
historian->redo();
|
historian->redo();
|
||||||
refreshSyntax();
|
refreshSyntax();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user