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

[escher/layout_field] Change cursor behavior

Browse Source 
Some code to prevent the input field from scrolling when switching to
the history in layout mode causes problems :
  - With a calculation in the history, type an empty matrix or fraction.
    Then with the cursor on an empty square, go to the history. The
    square will appear shifted to the right.

Change-Id: I72ebee675215dc3c3a3f8432890f6fee820ef5c9
This commit is contained in:
Gabriel Ozouf
2020-07-23 12:19:37 +02:00
committed by Émilie Feral
parent 9e3470436a
commit c04a7af22f
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ private:
constexpr static int k_maxNumberOfLayouts = 220;
static_assert(k_maxNumberOfLayouts == TextField::maxBufferSize(), "Maximal number of layouts in a layout field should be equal to max number of char in text field");
void reload(KDSize previousSize);
virtual bool privateHandleEvent(Ion::Events::Event event, bool * shouldScrollAndRedraw);
virtual bool privateHandleEvent(Ion::Events::Event event);
bool privateHandleMoveEvent(Ion::Events::Event event, bool * shouldRecomputeLayout);
bool privateHandleSelectionEvent(Ion::Events::Event event, bool * shouldRecomputeLayout);
void scrollRightOfLayout(Poincare::Layout layoutR);

18
escher/src/layout_field.cpp
View File

@@ -262,7 +262,11 @@ void LayoutField::ContentView::layoutSubviews(bool force) {
void LayoutField::ContentView::layoutCursorSubview(bool force) {
if (!m_isEditing) {
m_cursorView.setFrame(KDRectZero, force);
/* We keep track of the cursor's position to prevent the input field from
* scrolling to the beginning when switching to the history. This way,
* when calling scrollToCursor after layoutCursorSubview, we don't lose
* sight of the cursor. */
m_cursorView.setFrame(KDRect(cursorRect().x(), cursorRect().y(), 0, 0), force);
return;
}
KDPoint expressionViewOrigin = m_expressionView.absoluteDrawingOrigin();
@@ -430,7 +434,6 @@ bool LayoutField::handleEvent(Ion::Events::Event event) {
if (!eventShouldUpdateInsertionCursor(event)) {
m_contentView.invalidateInsertionCursor();
}
bool shouldScrollAndRedraw = true;
if (privateHandleMoveEvent(event, &moveEventChangedLayout)) {
if (!isEditing()) {
setEditing(true);
@@ -454,12 +457,7 @@ bool LayoutField::handleEvent(Ion::Events::Event event) {
}
shouldRecomputeLayout = m_contentView.cursor()->layout().removeGraySquaresFromAllMatrixChildren() || removedSquares || shouldRecomputeLayout;
}
} else if (privateHandleEvent(event, &shouldScrollAndRedraw)) {
if (!shouldScrollAndRedraw) {
/* We escape early to avoid scrolling to the beginning of the expression,
* and to mimic the behaviour of the TextField. */
return true;
}
} else if (privateHandleEvent(event)) {
shouldRecomputeLayout = true;
didHandleEvent = true;
}
@@ -507,10 +505,8 @@ static inline bool IsMoveEvent(Ion::Events::Event event) {
static_cast<uint8_t>(event) <= static_cast<uint8_t>(Ion::Events::Right);
}
bool LayoutField::privateHandleEvent(Ion::Events::Event event, bool * shouldScrollAndRedraw) {
assert(*shouldScrollAndRedraw);
bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
if (m_delegate && m_delegate->layoutFieldDidReceiveEvent(this, event)) {
*shouldScrollAndRedraw = false;
return true;
}
if (handleBoxEvent(event)) {