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

[poincare/layout_cursor] Fix selectUpDown if pointed layout detached

Browse Source 
Scenario: 23/[[1 |empty] [empty empty]] then select up
This commit is contained in:
Léa Saviot
2020-01-09 10:38:40 +01:00
parent 344ea5a67a
commit 94cd3ecde7
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
poincare/src/layout_cursor.cpp
View File

@@ -365,6 +365,7 @@ void LayoutCursor::selectLeftRight(bool right, bool * shouldRecomputeLayout, Lay
void LayoutCursor::selectUpDown(bool up, bool * shouldRecomputeLayout, Layout * selection) {
// Move the cursor in the selection direction
Layout p = m_layout.parent();
LayoutCursor c = cursorAtDirection(up ? Direction::Up : Direction::Down, shouldRecomputeLayout, true);
if (!c.isDefined()) {
return;
@@ -372,13 +373,24 @@ void LayoutCursor::selectUpDown(bool up, bool * shouldRecomputeLayout, Layout *
/* Find the first common ancestor between the current layout and the layout of
* the moved cursor (also check the common ancestor with the equivalent
* position). This ancestor will be the added selection. */
TreeHandle ancestor1 = m_layout.commonAncestorWith(c.layout());
* position). This ancestor will be the added selection.
*
* The current layout might have been detached from its parent, for instance
* if it was a grey empty layout of a matrix and the cursor move exited this
* matrix. In this case, use the layout parent (it should still be attached to
* the main layout). */
const bool previousLayoutWasDetached = m_layout.parent() != p;
Layout previousCursoredLayout = previousLayoutWasDetached ? p : m_layout;
TreeHandle ancestor1 = previousCursoredLayout.commonAncestorWith(c.layout());
TreeHandle ancestor2 = Layout();
LayoutCursor eqCursor = m_layout.equivalentCursor(this);
Layout equivalentLayout = eqCursor.layout();
if (!equivalentLayout.isUninitialized()) {
ancestor2 = equivalentLayout.commonAncestorWith(c.layout());
LayoutCursor eqCursor;
if (!previousLayoutWasDetached) {
eqCursor = previousCursoredLayout.equivalentCursor(this);
Layout equivalentLayout = eqCursor.layout();
if (!equivalentLayout.isUninitialized()) {
ancestor2 = equivalentLayout.commonAncestorWith(c.layout());
}
}
// Select the closest common ancestor
bool ancestorOfPointedLayoutSelected = ancestor2.isUninitialized() || !ancestor2.hasAncestor(ancestor1, true);