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

[expression_editor] Controller code cleaning.

Browse Source 
Change-Id: Ifb31ad712ce9c59e21fc3d670d05f60a15669d60
This commit is contained in:
Léa Saviot
2017-12-20 11:23:58 +01:00
parent 3c45358296
commit 4d94764c36
4 changed files with 92 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
apps/expression_editor/controller.cpp
View File

@@ -1,7 +1,4 @@
#include "controller.h"
#include <poincare/src/layout/char_layout.h> //TODO move from there.
#include <poincare/src/layout/fraction_layout.h> //TODO move from there.
#include <poincare/src/layout/empty_visible_layout.h> //TODO move from there.
using namespace Poincare;
@@ -31,49 +28,53 @@ void Controller::didBecomeFirstResponder() {
}
bool Controller::handleEvent(Ion::Events::Event event) {
bool returnValue = false;
if ((event == Ion::Events::Left && m_cursor.moveLeft())
|| (event == Ion::Events::Right && m_cursor.moveRight())
|| (event == Ion::Events::Up && m_cursor.moveUp())
|| (event == Ion::Events::Down && m_cursor.moveDown()))
{
returnValue = true;
} else if (event == Ion::Events::Division) {
EmptyVisibleLayout * child1 = new EmptyVisibleLayout();
EmptyVisibleLayout * child2 = new EmptyVisibleLayout();
if (privateHandleEvent(event)) {
m_view.cursorPositionChanged();
return true;
}
return false;
}
FractionLayout * newChild = new FractionLayout(child1, child2, false);
m_cursor.pointedExpressionLayout()->addBrother(&m_cursor, newChild);
m_cursor.setPointedExpressionLayout(newChild);
bool Controller::privateHandleEvent(Ion::Events::Event event) {
if (handleMoveEvent(event)) {
return true;
}
ExpressionLayout * newPointedLayout = handleAddEvent(event);
if (newPointedLayout != nullptr) {
m_cursor.setPointedExpressionLayout(newPointedLayout);
m_cursor.setPosition(ExpressionLayoutCursor::Position::Right);
m_cursor.setPositionInside(0);
returnValue = true;
m_expressionLayout->invalidAllSizesPositionsAndBaselines();
m_view.layoutSubviews();
} else if (event.hasText()) {
insertTextAtCursor(event.text());
returnValue = true;
m_expressionLayout->invalidAllSizesPositionsAndBaselines();
m_view.layoutSubviews();
return true;
}
m_view.cursorPositionChanged();
return returnValue;
return false;
}
void Controller::insertTextAtCursor(const char * text) {
int textLength = strlen(text);
if (textLength <= 0) {
return;
bool Controller::handleMoveEvent(Ion::Events::Event event) {
if (event == Ion::Events::Left) {
return m_cursor.moveLeft();
}
CharLayout * newChild = nullptr;
for (int i = 0; i < textLength; i++) {
newChild = new CharLayout(text[i]);
m_cursor.pointedExpressionLayout()->addBrother(&m_cursor, newChild);
if (event == Ion::Events::Right) {
return m_cursor.moveRight();
}
assert(newChild != nullptr);
m_cursor.setPointedExpressionLayout(newChild);
m_cursor.setPosition(ExpressionLayoutCursor::Position::Right);
m_cursor.setPositionInside(0);
if (event == Ion::Events::Up) {
return m_cursor.moveUp();
}
if (event == Ion::Events::Down) {
return m_cursor.moveDown();
}
return false;
}
ExpressionLayout * Controller::handleAddEvent(Ion::Events::Event event) {
if (event == Ion::Events::Division) {
return m_cursor.addEmptyFractionLayout();
}
if (event.hasText()) {
return m_cursor.insertText(event.text());
}
return nullptr;
}
}