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

[poincare] addBrother should first assess if the layout is horizontal.

Browse Source 
Before, if the cursor was Right of an HorizontalLayout, pressing "/" might put
the whole HorizontalLayout as the numerator of the new fraction, because the
fraction layout was added as a brother of the HorizontalLayout, not a child.

Change-Id: I3b58920e48db49ccd4204c405362d148260461d4
This commit is contained in:
Léa Saviot
2018-01-09 09:50:04 +01:00
parent 1fb2ab1829
commit 0575cd2d60
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
poincare/src/layout/expression_layout.cpp
View File

@@ -110,32 +110,35 @@ bool ExpressionLayout::hasAncestor(const ExpressionLayout * e) const {
}
void ExpressionLayout::addBrother(ExpressionLayoutCursor * cursor, ExpressionLayout * brother) {
if (m_parent) {
int brotherIndex = cursor->position() == ExpressionLayoutCursor::Position::Left ? m_parent->indexOfChild(this) : m_parent->indexOfChild(this) + 1;
if (m_parent->isHorizontal()) {
static_cast<HorizontalLayout *>(m_parent)->addOrMergeChildAtIndex(brother, brotherIndex);
return;
// First, assess the special case when the layout is horizontal.
// If so, add the "brother" as a child.
if (isHorizontal()) {
// If there is only one empty child, remove it before adding the layout.
if (numberOfChildren() == 1 && editableChild(0)->isEmpty()) {
removeChildAtIndex(0, true);
}
if (cursor->position() == ExpressionLayoutCursor::Position::Left) {
replaceWithJuxtapositionOf(brother, this, false);
addChildAtIndex(brother, 0);
return;
}
assert(cursor->position() == ExpressionLayoutCursor::Position::Right);
replaceWithJuxtapositionOf(this, brother, false);
addChildAtIndex(brother, numberOfChildren());
return;
}
// If there is no parent, the pointed layout is the main horizontal layout.
// Add the "brother" as a child.
// If there is only one empty child, remove it before adding the layout.
if (numberOfChildren() == 1 && editableChild(0)->isEmpty()) {
removeChildAtIndex(0, true);
// If the layout is not horizontal, it must have a parent.
assert(m_parent);
int brotherIndex = cursor->position() == ExpressionLayoutCursor::Position::Left ? m_parent->indexOfChild(this) : m_parent->indexOfChild(this) + 1;
if (m_parent->isHorizontal()) {
static_cast<HorizontalLayout *>(m_parent)->addOrMergeChildAtIndex(brother, brotherIndex);
return;
}
if (cursor->position() == ExpressionLayoutCursor::Position::Left) {
addChildAtIndex(brother, 0);
replaceWithJuxtapositionOf(brother, this, false);
return;
}
assert(cursor->position() == ExpressionLayoutCursor::Position::Right);
addChildAtIndex(brother, numberOfChildren());
replaceWithJuxtapositionOf(this, brother, false);
return;
}