UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 17:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/layout_field] When pasting, force cursor right of pasted text

Browse Source 
Even if the text is inserted code point per code point
This commit is contained in:
Léa Saviot
2020-01-10 10:49:16 +01:00
parent d446d1cb61
commit 8f86769cd1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/src/layout_field.cpp
View File

@@ -336,7 +336,7 @@ bool LayoutField::handleEventWithText(const char * text, bool indentation, bool
if (resultExpression.isUninitialized()) {
// The text is not parsable (for instance, ",") and is added char by char.
KDSize previousLayoutSize = minimalSizeForOptimalDisplay();
m_contentView.cursor()->insertText(text);
m_contentView.cursor()->insertText(text, forceCursorRightOfText);
reload(previousLayoutSize);
return true;
}

2
poincare/include/poincare/layout_cursor.h
View File

@@ -114,7 +114,7 @@ public:
void addEmptyTenPowerLayout();
void addFractionLayoutAndCollapseSiblings();
void addXNTCodePointLayout();
void insertText(const char * text);
void insertText(const char * text, bool forceCursorRightOfText = false);
void addLayoutAndMoveCursor(Layout l);
bool showEmptyLayoutIfNeeded() { return privateShowHideEmptyLayoutIfNeeded(true); }
bool hideEmptyLayoutIfNeeded() { return privateShowHideEmptyLayoutIfNeeded(false); }

4
poincare/src/layout_cursor.cpp
View File

@@ -154,7 +154,7 @@ void LayoutCursor::addXNTCodePointLayout() {
m_layout.addSibling(this, CodePointLayout::Builder(m_layout.XNTCodePoint()), true);
}
void LayoutCursor::insertText(const char * text) {
void LayoutCursor::insertText(const char * text, bool forceCursorRightOfText) {
Layout newChild;
Layout pointedChild;
UTF8Decoder decoder(text);
@@ -199,7 +199,7 @@ void LayoutCursor::insertText(const char * text) {
codePoint = decoder.nextCodePoint();
}
}
if (!pointedChild.isUninitialized() && !pointedChild.parent().isUninitialized()) {
if (!forceCursorRightOfText && !pointedChild.isUninitialized() && !pointedChild.parent().isUninitialized()) {
m_layout = pointedChild;
m_position = Position::Right;
}