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

[apps/escher] Rename cursorTextLocation as cursorLocation

Browse Source
This commit is contained in:
Léa Saviot
2019-01-23 16:11:35 +01:00
committed by Émilie Feral
parent 6765de4598
commit bd2ea41fbe
12 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
escher/src/text_input.cpp
View File

@@ -6,11 +6,11 @@
static inline const char * minCharPointer(const char * x, const char * y) { return x < y ? x : y; }
static inline const char * maxCharPointer(const char * x, const char * y) { return x > y ? x : y; }
void TextInput::ContentView::setCursorTextLocation(const char * location) {
void TextInput::ContentView::setCursorLocation(const char * location) {
assert(location != nullptr);
assert(location >= editedText());
const char * adjustedLocation = minCharPointer(location, editedText() + editedTextLength());
m_cursorTextLocation = adjustedLocation;
m_cursorLocation = adjustedLocation;
layoutSubviews();
}
@@ -20,7 +20,7 @@ void TextInput::ContentView::setFont(const KDFont * font) {
}
KDRect TextInput::ContentView::cursorRect() {
return glyphFrameAtPosition(m_cursorTextLocation);
return glyphFrameAtPosition(m_cursorLocation);
}
void TextInput::ContentView::layoutSubviews() {
@@ -68,11 +68,11 @@ void TextInput::scrollToCursor() {
scrollToContentRect(contentView()->cursorRect(), true);
}
bool TextInput::setCursorTextLocation(const char * location) {
bool TextInput::setCursorLocation(const char * location) {
assert(location != nullptr);
const char * adjustedLocation = maxCharPointer(location, text());
willSetCursorTextLocation(&adjustedLocation);
contentView()->setCursorTextLocation(adjustedLocation);
willSetCursorLocation(&adjustedLocation);
contentView()->setCursorLocation(adjustedLocation);
scrollToCursor();
return true;
}