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

[poincare] Layout::serialize is serializeForParsing or ParsedExpression

Browse Source 
serializeForParsing serializes the layout once,
serializeParsedExpression serializes the layout, parses it and
serializes it again.
This commit is contained in:
Léa Saviot
2018-11-21 14:49:20 +01:00
committed by Émilie Feral
parent 2bdce9dd82
commit 94603b2b7d
11 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/solver/list_controller.cpp
View File

@@ -1,5 +1,6 @@
#include "list_controller.h"
#include "app.h"
#include <poincare/char_layout.h>
#include <assert.h>
using namespace Shared;
@@ -120,6 +121,12 @@ bool textRepresentsAnEquality(const char * text) {
return false;
}
bool layoutRepresentsAnEquality(Poincare::Layout l) {
return l.recursivelyMatches(
[](Poincare::Layout layout) {
return layout.isChar() && static_cast<Poincare::CharLayout &>(layout).character() == '"'; });
}
bool ListController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
if (textField->isEditing() && textField->shouldFinishEditing(event)) {
if (!textRepresentsAnEquality(textField->text())) {
@@ -139,13 +146,10 @@ bool ListController::textFieldDidReceiveEvent(TextField * textField, Ion::Events
bool ListController::layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) {
if (layoutField->isEditing() && layoutField->shouldFinishEditing(event)) {
char buffer[TextField::maxBufferSize()];
layoutField->serialize(buffer, TextField::maxBufferSize());
if (!textRepresentsAnEquality(buffer)) {
if (!layoutRepresentsAnEquality(layoutField->layout())) {
layoutField->handleEvent(Ion::Events::ShiftRight);
layoutField->handleEventWithText("=0");
layoutField->serialize(buffer, TextField::maxBufferSize());
if (!textRepresentsAnEquality(buffer)) {
if (!layoutRepresentsAnEquality(layoutField->layout())) {
app()->displayWarning(I18n::Message::RequireEquation);
return true;
}