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

[escher] Fix TextField::setText update of draftTextLength and cursorLoc

Browse Source
This commit is contained in:
Léa Saviot
2018-11-16 17:37:27 +01:00
committed by Émilie Feral
parent 8b87a6a893
commit 824ffd9c21
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
escher/src/text_field.cpp
View File

@@ -57,15 +57,14 @@ size_t TextField::ContentView::editedTextLength() const {
void TextField::ContentView::setText(const char * text) {
reloadRectFromCursorPosition(0);
int textLength = strlen(text) >= m_textBufferSize ? m_textBufferSize-1 : strlen(text);
if (m_isEditing) {
strlcpy(m_draftTextBuffer, text, m_textBufferSize);
size_t textRealLength = strlen(text);
int textLength = textRealLength >= m_textBufferSize ? m_textBufferSize-1 : textRealLength;
// Copy the text
strlcpy(m_isEditing ? m_draftTextBuffer : m_textBuffer, text, m_textBufferSize);
// Update the draft text length and cursor location
if (m_isEditing || m_textBuffer == m_draftTextBuffer) {
m_currentDraftTextLength = textLength;
} else {
strlcpy(m_textBuffer, text, m_textBufferSize);
if (m_textBuffer == m_draftTextBuffer) {
m_currentDraftTextLength = textLength;
}
setCursorLocation(textLength);
}
reloadRectFromCursorPosition(0);
}
@@ -228,9 +227,6 @@ size_t TextField::draftTextLength() const {
void TextField::setText(const char * text) {
reloadScroll();
m_contentView.setText(text);
if (isEditing()) {
setCursorLocation(draftTextLength());
}
}
void TextField::setAlignment(float horizontalAlignment, float verticalAlignment) {