UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 11:39:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[escher/poincare] Remove duplicate function

Browse Source 
Change-Id: Ie7ab03d1f2716d751f85a9f9747b064892a9b19e
This commit is contained in:
Léa Saviot
2018-04-17 15:42:07 +02:00
parent 0fee6685fe
commit f07127b68b
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
escher/src/scrollable_expression_view_with_cursor.cpp
View File

@@ -208,16 +208,13 @@ void ScrollableExpressionViewWithCursor::insertLayoutAtCursor(Poincare::Expressi
static_cast<Poincare::MatrixLayout *>(layout)->addGreySquares();
}
bool layoutWillBeMerged = layout->isHorizontal();
if (!layoutWillBeMerged) {
m_expressionViewWithCursor.cursor()->addLayout(layout);
if (pointedLayout != nullptr) {
m_expressionViewWithCursor.cursor()->setPointedExpressionLayout(pointedLayout);
} else {
m_expressionViewWithCursor.cursor()->setPointedExpressionLayout(layout->layoutToPointWhenInserting());
}
m_expressionViewWithCursor.cursor()->addLayoutAndMoveCursor(layout);
if (pointedLayout != nullptr) {
m_expressionViewWithCursor.cursor()->setPointedExpressionLayout(pointedLayout);
m_expressionViewWithCursor.cursor()->setPosition(Poincare::ExpressionLayoutCursor::Position::Right);
} else if (!layoutWillBeMerged) {
m_expressionViewWithCursor.cursor()->setPointedExpressionLayout(layout->layoutToPointWhenInserting());
m_expressionViewWithCursor.cursor()->setPosition(Poincare::ExpressionLayoutCursor::Position::Right);
} else {
m_expressionViewWithCursor.cursor()->addLayoutAndMoveCursor(layout);
}
m_expressionViewWithCursor.cursor()->hideEmptyLayoutIfNeeded();
reload();

1
poincare/include/poincare/expression_layout_cursor.h
View File

@@ -39,7 +39,6 @@ public:
bool moveDown(bool * shouldRecomputeLayout);
/* Edition */
void addLayout(ExpressionLayout * layout);
void addLayoutAndMoveCursor(ExpressionLayout * layout);
void addEmptyExponentialLayout();
void addFractionLayoutAndCollapseBrothers();

4
poincare/src/expression_layout_cursor.cpp
View File

@@ -41,10 +41,6 @@ bool ExpressionLayoutCursor::moveDown(bool * shouldRecomputeLayout) {
return m_pointedExpressionLayout->moveDown(this, shouldRecomputeLayout);
}
void ExpressionLayoutCursor::addLayout(ExpressionLayout * layout) {
pointedExpressionLayout()->addBrother(this, layout);
}
void ExpressionLayoutCursor::addLayoutAndMoveCursor(ExpressionLayout * layout) {
bool layoutWillBeMerged = layout->isHorizontal();
pointedExpressionLayout()->addBrotherAndMoveCursor(this, layout);