UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Cleaner code in textfield

Browse Source 
Change-Id: If74fd9b9a70f68083c56033014bd49bb17a40d6d
This commit is contained in:
Émilie Feral
2017-04-25 11:53:12 +02:00
parent 537f1a5dd6
commit cde8969b3e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
escher/src/text_field.cpp
View File

@@ -312,15 +312,15 @@ bool TextField::handleEvent(Ion::Events::Event event) {
setCursorLocation(cursorLoc);
return true;
}
if (event == Ion::Events::OK) {
if (event == Ion::Events::OK && !isEditing()) {
setEditing(true);
/* If the text could not be inserted (buffer is full), we set the cursor
* at the end of the text. */
int nextCursorLocation = textLength();
if (insertTextAtLocation(m_contentView.textBuffer(), cursorLocation())) {
setCursorLocation(strlen(m_contentView.draftTextBuffer()));
} else {
/* If the text could not be inserted (buffer is full), we set the cursor
* at the end of the text. */
setCursorLocation(textLength());
nextCursorLocation = strlen(m_contentView.draftTextBuffer());
}
setCursorLocation(nextCursorLocation);
return true;
}
if (event == Ion::Events::Backspace && isEditing()) {
@@ -332,14 +332,14 @@ bool TextField::handleEvent(Ion::Events::Event event) {
if (!isEditing()) {
setEditing(true);
}
int nextCursorLocation = textLength();
if (insertTextAtLocation(event.text(), cursorLocation())) {
/* All events whose text is longer than 2 have parenthesis. In these cases,
* we want to position the cursor before the last parenthesis */
int cursorDelta = strlen(event.text()) > 2 ? -1 : 0;
setCursorLocation(cursorLocation() + strlen(event.text()) + cursorDelta);
} else {
setCursorLocation(maxBufferSize());
nextCursorLocation = cursorLocation() + strlen(event.text()) + cursorDelta;
}
setCursorLocation(nextCursorLocation);
layoutSubviews();
return true;
}