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] Scroll speed increase for long repetition in text area

Browse Source 
Change-Id: Ia468bd3ae3f247937127228a11e3d51653dd2ae2
This commit is contained in:
Hugo Saint-Vignes
2020-06-10 11:04:02 +02:00
committed by Émilie Feral
parent c9964e69c2
commit e35f2cc938
4 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/include/escher/text_area.h
View File

@@ -131,7 +131,7 @@ protected:
ContentView * contentView() { return static_cast<ContentView *>(TextInput::contentView()); }
private:
void selectUpDown(bool up);
void selectUpDown(bool up, int step);
TextAreaDelegate * m_delegate;
};

7
escher/include/escher/text_input.h
View File

@@ -98,9 +98,10 @@ protected:
return const_cast<ContentView *>(nonEditableContentView());
}
virtual const ContentView * nonEditableContentView() const = 0;
bool moveCursorLeft();
bool moveCursorRight();
bool selectLeftRight(bool left, bool all); // While indicates if all the text on the left/right should be selected
bool moveCursorLeft(int step = 1);
bool moveCursorRight(int step = 1);
// all indicates if all the text on the left/right should be selected
bool selectLeftRight(bool left, bool all, int step = 1);
private:
virtual void willSetCursorLocation(const char * * location) {}
virtual bool privateRemoveEndOfLine();

30
escher/src/text_area.cpp
View File

@@ -106,25 +106,22 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
if (handleBoxEvent(event)) {
return true;
}
int step = Ion::Events::longRepetitionScrollSpeed();
if (event == Ion::Events::ShiftLeft || event == Ion::Events::ShiftRight) {
selectLeftRight(event == Ion::Events::ShiftLeft, false);
selectLeftRight(event == Ion::Events::ShiftLeft, false, step);
return true;
}
if (event == Ion::Events::ShiftUp ||event == Ion::Events::ShiftDown) {
selectUpDown(event == Ion::Events::ShiftUp);
if (event == Ion::Events::ShiftUp || event == Ion::Events::ShiftDown) {
selectUpDown(event == Ion::Events::ShiftUp, step);
return true;
}
if (event == Ion::Events::Left) {
if (event == Ion::Events::Left || event == Ion::Events::Right) {
if (contentView()->resetSelection()) {
return true;
}
return TextInput::moveCursorLeft();
}
if (event == Ion::Events::Right) {
if (contentView()->resetSelection()) {
return true;
}
return TextInput::moveCursorRight();
return (event == Ion::Events::Left) ?
TextInput::moveCursorLeft(step) :
TextInput::moveCursorRight(step);
}
if (event.hasText()) {
@@ -158,12 +155,9 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
deleteSelection();
return true;
}
} else if (event == Ion::Events::Up) {
} else if (event == Ion::Events::Up || event == Ion::Events::Down) {
contentView()->resetSelection();
contentView()->moveCursorGeo(0, -1);
} else if (event == Ion::Events::Down) {
contentView()->resetSelection();
contentView()->moveCursorGeo(0, 1);
contentView()->moveCursorGeo(0, event == Ion::Events::Up ? -step : step);
} else if (event == Ion::Events::Clear) {
if (!contentView()->selectionIsEmpty()) {
deleteSelection();
@@ -565,9 +559,9 @@ void TextArea::ContentView::moveCursorGeo(int deltaX, int deltaY) {
setCursorLocation(m_text.pointerAtPosition(Text::Position(p.column() + deltaX, p.line() + deltaY)));
}
void TextArea::selectUpDown(bool up) {
void TextArea::selectUpDown(bool up, int step) {
const char * previousCursorLocation = contentView()->cursorLocation();
contentView()->moveCursorGeo(0, up ? -1 : 1);
contentView()->moveCursorGeo(0, up ? -step : step);
const char * newCursorLocation = contentView()->cursorLocation();
contentView()->addSelection(up ? newCursorLocation : previousCursorLocation, up ? previousCursorLocation : newCursorLocation);
scrollToCursor();

44
escher/src/text_input.cpp
View File

@@ -187,28 +187,46 @@ bool TextInput::removeEndOfLine() {
return false;
}
bool TextInput::moveCursorLeft() {
if (cursorLocation() <= text()) {
assert(cursorLocation() == text());
return false;
bool TextInput::moveCursorLeft(int step) {
// Move the cursor to the left step times, or until limit is reached.
int i = 0;
bool canMove = true;
while (canMove && i < step) {
if (cursorLocation() <= text()) {
assert(cursorLocation() == text());
canMove = false;
} else {
UTF8Decoder decoder(text(), cursorLocation());
canMove = setCursorLocation(decoder.previousGlyphPosition());
}
i++;
}
UTF8Decoder decoder(text(), cursorLocation());
return setCursorLocation(decoder.previousGlyphPosition());
// true is returned if there was at least one successful cursor mouvement
return (i > 1 || canMove);
}
bool TextInput::moveCursorRight() {
if (UTF8Helper::CodePointIs(cursorLocation(), UCodePointNull)) {
return false;
bool TextInput::moveCursorRight(int step) {
// Move the cursor to the right step times, or until limit is reached.
int i = 0;
bool canMove = true;
while (canMove && i < step) {
if (UTF8Helper::CodePointIs(cursorLocation(), UCodePointNull)) {
canMove = false;
} else {
UTF8Decoder decoder(cursorLocation());
canMove = setCursorLocation(decoder.nextGlyphPosition());
}
i++;
}
UTF8Decoder decoder(cursorLocation());
return setCursorLocation(decoder.nextGlyphPosition());
// true is returned if there was at least one successful cursor mouvement
return (i > 1 || canMove);
}
bool TextInput::selectLeftRight(bool left, bool all) {
bool TextInput::selectLeftRight(bool left, bool all, int step) {
const char * cursorLoc = cursorLocation();
const char * nextCursorLoc = nullptr;
if (!all) {
bool moved = left ? moveCursorLeft() : moveCursorRight();
bool moved = left ? moveCursorLeft(step) : moveCursorRight(step);
if (!moved) {
return false;
}