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

[escher] ExpressionLayoutFieldDelegate should not take a text as

Browse Source 
parameter but a layout
Warning: in ExpressionField: the serialized layout is not guaranteed to
be small enough to fill in the text buffer
This commit is contained in:
Émilie Feral
2018-05-17 11:31:28 +02:00
committed by EmilieNumworks
parent 33ac117424
commit 5dcfbf83e9
9 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/calculation/edit_expression_controller.cpp
View File

@@ -6,6 +6,7 @@
#include <assert.h>
using namespace Shared;
using namespace Poincare;
namespace Calculation {
@@ -53,10 +54,6 @@ EditExpressionController::EditExpressionController(Responder * parentResponder,
m_cacheBuffer[0] = 0;
}
const char * EditExpressionController::textBody() {
return ((ContentView *)view())->expressionField()->text();
}
void EditExpressionController::insertTextBody(const char * text) {
((ContentView *)view())->expressionField()->handleEventWithText(text, false, true);
}
@@ -88,7 +85,7 @@ bool EditExpressionController::textFieldDidReceiveEvent(::TextField * textField,
}
bool EditExpressionController::textFieldDidFinishEditing(::TextField * textField, const char * text, Ion::Events::Event event) {
return inputViewDidFinishEditing(text, event);
return inputViewDidFinishEditing(text, nullptr);
}
bool EditExpressionController::textFieldDidAbortEditing(::TextField * textField) {
@@ -102,8 +99,8 @@ bool EditExpressionController::expressionLayoutFieldDidReceiveEvent(::Expression
return expressionFieldDelegateApp()->expressionLayoutFieldDidReceiveEvent(expressionLayoutField, event);
}
bool EditExpressionController::expressionLayoutFieldDidFinishEditing(::ExpressionLayoutField * expressionLayoutField, const char * text, Ion::Events::Event event) {
return inputViewDidFinishEditing(text, event);
bool EditExpressionController::expressionLayoutFieldDidFinishEditing(::ExpressionLayoutField * expressionLayoutField, ExpressionLayout * layout, Ion::Events::Event event) {
return inputViewDidFinishEditing(nullptr, layout);
}
bool EditExpressionController::expressionLayoutFieldDidAbortEditing(::ExpressionLayoutField * expressionLayoutField) {
@@ -159,10 +156,17 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
return true;
}
bool EditExpressionController::inputViewDidFinishEditing(const char * text, Ion::Events::Event event) {
bool EditExpressionController::inputViewDidFinishEditing(const char * text, ExpressionLayout * layout) {
App * calculationApp = (App *)app();
strlcpy(m_cacheBuffer, textBody(), Calculation::k_printedExpressionSize);
m_calculationStore->push(textBody(), calculationApp->localContext());
if (layout == nullptr) {
assert(text);
strlcpy(m_cacheBuffer, text, Calculation::k_printedExpressionSize);
} else {
assert(layout);
layout->writeTextInBuffer(m_cacheBuffer, Calculation::k_printedExpressionSize);
}
m_calculationStore->push(m_cacheBuffer, calculationApp->localContext());
m_historyController->reload();
((ContentView *)view())->mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
((ContentView *)view())->expressionField()->setEditing(true);