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

[poincare] Better Fraction collapsing.

Browse Source 
Change-Id: Ic898f522ae26cfcd5917f4da85715f85a5861b9f
This commit is contained in:
Léa Saviot
2018-01-04 15:27:44 +01:00
parent 9753228a3d
commit 98faf01b53
4 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,8 @@ public:
bool addChildAtIndex(ExpressionLayout * operand, int index) override;
void removeChildAtIndex(int index, bool deleteAfterRemoval) override;
bool isEmpty() const override;
protected:
const ExpressionLayout ** m_children;
int m_numberOfChildren;

13
poincare/src/layout/dynamic_layout_hierarchy.cpp
View File

@@ -70,15 +70,18 @@ void DynamicLayoutHierarchy::removeChildAtIndex(int index, bool deleteAfterRemov
const_cast<ExpressionLayout *>(m_children[index])->setParent(nullptr);
}
m_numberOfChildren--;
/*if (m_numberOfChildren == 0) {
ExpressionLayout * emptyVisibleLayout = new EmptyVisibleLayout();
replaceWith(emptyVisibleLayout);
return;
}*/
for (int j=index; j<m_numberOfChildren; j++) {
m_children[j] = m_children[j+1];
}
}
bool DynamicLayoutHierarchy::isEmpty() const {
if (m_numberOfChildren == 0
|| (m_numberOfChildren == 1&& child(0)->isEmpty()))
{
return true;
}
return false;
}
}

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

@@ -113,7 +113,7 @@ void ExpressionLayout::addBrother(ExpressionLayoutCursor * cursor, ExpressionLay
if (m_parent) {
int brotherIndex = cursor->position() == ExpressionLayoutCursor::Position::Left ? m_parent->indexOfChild(this) : m_parent->indexOfChild(this) + 1;
if (m_parent->isHorizontal()) {
m_parent->addChildAtIndex(brother, brotherIndex);
static_cast<HorizontalLayout *>(m_parent)->addOrMergeChildAtIndex(brother, brotherIndex);
return;
}
if (cursor->position() == ExpressionLayoutCursor::Position::Left) {

75
poincare/src/layout/fraction_layout.cpp
View File

@@ -18,55 +18,44 @@ void FractionLayout::backspaceAtCursor(ExpressionLayoutCursor * cursor) {
// a horizontal juxtaposition of the numerator and the denominator.
if (cursor->pointedExpressionLayout() == denominatorLayout()) {
assert(cursor->position() == ExpressionLayoutCursor::Position::Left);
if (numeratorLayout()->isEmpty()) {
if (denominatorLayout()->isEmpty()) {
// If the numerator and the denominator are empty, replace the fraction
// with an empty layout.
ExpressionLayout * previousParent = m_parent;
int indexInParent = previousParent->indexOfChild(this);
replaceWith(new EmptyVisibleLayout(), true);
// Place the cursor on the right of the left brother ofthe fraction if
// there is one.
if (indexInParent > 0) {
cursor->setPointedExpressionLayout(previousParent->editableChild(indexInParent - 1));
cursor->setPosition(ExpressionLayoutCursor::Position::Right);
return;
}
// Else place the cursor on the Left of the parent.
cursor->setPointedExpressionLayout(previousParent);
if (numeratorLayout()->isEmpty() && denominatorLayout()->isEmpty()) {
// If the numerator and the denominator are empty, replace the fraction
// with an empty layout.
ExpressionLayout * previousParent = m_parent;
int indexInParent = previousParent->indexOfChild(this);
replaceWith(new EmptyVisibleLayout(), true);
// Place the cursor on the right of the left brother of the fraction if
// there is one.
if (indexInParent > 0) {
cursor->setPointedExpressionLayout(previousParent->editableChild(indexInParent - 1));
cursor->setPosition(ExpressionLayoutCursor::Position::Right);
return;
}
// If the numerator is empty but not the denominator, replace the fraction
// with its denominator. Place the cursor on the left of the denominator.
ExpressionLayout * nextPointedLayout = denominatorLayout();
if (denominatorLayout()->isHorizontal()) {
nextPointedLayout = denominatorLayout()->editableChild(0);
}
replaceWith(denominatorLayout(), true);
cursor->setPointedExpressionLayout(nextPointedLayout);
cursor->setPosition(ExpressionLayoutCursor::Position::Left);
// Else place the cursor on the Left of the parent.
cursor->setPointedExpressionLayout(previousParent);
return;
}
// If the denominator is empty but not the numerator, replace the fraction
// with the numerator and place the cursor on its right.
if (denominatorLayout()->isEmpty()) {
ExpressionLayout * nextPointedLayout = numeratorLayout();
if (numeratorLayout()->isHorizontal()) {
nextPointedLayout = numeratorLayout()->editableChild(numeratorLayout()->numberOfChildren() - 1);
}
replaceWith(numeratorLayout(), true);
cursor->setPointedExpressionLayout(nextPointedLayout);
cursor->setPosition(ExpressionLayoutCursor::Position::Right);
return;
}
// If neither the numerator nor the denominator are empty, replace the
// fraction with a juxtaposition of the numerator and denominator. Place the
// cursor in the middle of the juxtaposition, which is right of the
// numerator.
// Else, replace the fraction with a juxtaposition of the numerator and
// denominator. Place the cursor in the middle of the juxtaposition, which
// is right of the numerator.
// Prepare the cursor position.
ExpressionLayout * nextPointedLayout = numeratorLayout();
if (numeratorLayout()->isHorizontal()) {
ExpressionLayoutCursor::Position nextPosition = ExpressionLayoutCursor::Position::Right;
if (numeratorLayout()->isEmpty()) {
int indexInParent = m_parent->indexOfChild(this);
if (indexInParent > 0) {
nextPointedLayout = m_parent->editableChild(indexInParent - 1);
} else {
nextPointedLayout = m_parent;
nextPosition = ExpressionLayoutCursor::Position::Left;
}
} else if (numeratorLayout()->isHorizontal()) {
nextPointedLayout = numeratorLayout()->editableChild(numeratorLayout()->numberOfChildren() - 1);
}
// Juxtapose.
ExpressionLayout * numerator = numeratorLayout();
ExpressionLayout * denominator = denominatorLayout();
detachChild(numerator);
@@ -77,7 +66,7 @@ void FractionLayout::backspaceAtCursor(ExpressionLayoutCursor * cursor) {
// Add the denominator before the numerator to have the right order.
replaceWith(newLayout, true);
cursor->setPointedExpressionLayout(nextPointedLayout);
cursor->setPosition(ExpressionLayoutCursor::Position::Right);
cursor->setPosition(nextPosition);
return;
}
// If the cursor is on the left of the numerator, move Left of the fraction.