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

[apps] Change names: ExpressionLayout -> Layout

Browse Source
This commit is contained in:
Émilie Feral
2018-09-06 14:23:34 +02:00
parent 1d92883aed
commit 30f83cde2c
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sequence/list/list_controller.cpp
View File

@@ -29,8 +29,8 @@ Toolbox * ListController::toolboxForTextInput(TextInput * textInput) {
return toolboxForSender(textInput);
}
Toolbox * ListController::toolboxForExpressionLayoutField(ExpressionLayoutField * expressionLayoutField) {
return toolboxForSender(expressionLayoutField);
Toolbox * ListController::toolboxForLayoutField(LayoutField * layoutField) {
return toolboxForSender(layoutField);
}
TextFieldDelegateApp * ListController::textFieldDelegateApp() {

4
apps/sequence/list/list_controller.h
View File

@@ -14,7 +14,7 @@
namespace Sequence {
class ListController : public Shared::FunctionListController, public Shared::TextFieldDelegate, public Shared::ExpressionLayoutFieldDelegate {
class ListController : public Shared::FunctionListController, public Shared::TextFieldDelegate, public Shared::LayoutFieldDelegate {
public:
ListController(Responder * parentResponder, SequenceStore * sequenceStore, ButtonRowController * header, ButtonRowController * footer);
const char * title() override;
@@ -22,7 +22,7 @@ public:
KDCoordinate expressionRowHeight(int j) override;
void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
Toolbox * toolboxForTextInput(TextInput * textInput) override;
Toolbox * toolboxForExpressionLayoutField(ExpressionLayoutField * expressionLayoutField) override;
Toolbox * toolboxForLayoutField(LayoutField * layoutField) override;
void selectPreviousNewSequenceCell();
void editExpression(Sequence * sequence, int sequenceDefinitionIndex, Ion::Events::Event event);
private:

16
apps/solver/list_controller.cpp
View File

@@ -129,21 +129,21 @@ bool ListController::textFieldDidReceiveEvent(TextField * textField, Ion::Events
return false;
}
bool ListController::expressionLayoutFieldDidReceiveEvent(ExpressionLayoutField * expressionLayoutField, Ion::Events::Event event) {
if (expressionLayoutField->isEditing() && expressionLayoutField->expressionLayoutFieldShouldFinishEditing(event)) {
bool ListController::layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) {
if (layoutField->isEditing() && layoutField->layoutFieldShouldFinishEditing(event)) {
char buffer[TextField::maxBufferSize()];
expressionLayoutField->serialize(buffer, TextField::maxBufferSize());
layoutField->serialize(buffer, TextField::maxBufferSize());
if (!textRepresentsAnEquality(buffer)) {
expressionLayoutField->handleEvent(Ion::Events::ShiftRight);
expressionLayoutField->handleEventWithText("=0");
expressionLayoutField->serialize(buffer, TextField::maxBufferSize());
layoutField->handleEvent(Ion::Events::ShiftRight);
layoutField->handleEventWithText("=0");
layoutField->serialize(buffer, TextField::maxBufferSize());
if (!textRepresentsAnEquality(buffer)) {
app()->displayWarning(I18n::Message::RequireEquation);
return true;
}
}
}
if (Shared::ExpressionLayoutFieldDelegate::expressionLayoutFieldDidReceiveEvent(expressionLayoutField, event)) {
if (Shared::LayoutFieldDelegate::layoutFieldDidReceiveEvent(layoutField, event)) {
return true;
}
return false;
@@ -154,7 +154,7 @@ bool ListController::textFieldDidFinishEditing(TextField * textField, const char
return true;
}
bool ListController::expressionLayoutFieldDidFinishEditing(ExpressionLayoutField * expressionLayoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) {
bool ListController::layoutFieldDidFinishEditing(LayoutField * layoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) {
reloadButtonMessage();
return true;
}

8
apps/solver/list_controller.h
View File

@@ -12,7 +12,7 @@
namespace Solver {
class ListController : public Shared::ExpressionModelListController, public ButtonRowDelegate, public ListViewDataSource, public Shared::TextFieldDelegate, public Shared::ExpressionLayoutFieldDelegate {
class ListController : public Shared::ExpressionModelListController, public ButtonRowDelegate, public ListViewDataSource, public Shared::TextFieldDelegate, public Shared::LayoutFieldDelegate {
public:
ListController(Responder * parentResponder, EquationStore * equationStore, ButtonRowController * footer);
/* ButtonRowDelegate */
@@ -34,13 +34,13 @@ public:
void didBecomeFirstResponder() override;
void didEnterResponderChain(Responder * previousFirstResponder) override;
void editExpression(Shared::ExpressionModel * model, Ion::Events::Event event) override { return Shared::ExpressionModelListController::editExpression(model, event); }
/* Text/ExpressionLayout Field Delegate */
/* Text/Layout Field Delegate */
Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
bool expressionLayoutFieldDidReceiveEvent(ExpressionLayoutField * expressionLayoutField, Ion::Events::Event event) override;
bool layoutFieldDidReceiveEvent(LayoutField * layoutField, Ion::Events::Event event) override;
bool textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) override;
bool expressionLayoutFieldDidFinishEditing(ExpressionLayoutField * expressionLayoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) override;
bool layoutFieldDidFinishEditing(LayoutField * layoutField, Poincare::ExpressionLayout * layout, Ion::Events::Event event) override;
/* Specific to Solver */
void resolveEquations();
private:

2
escher/include/escher/expression_field.h
View File

@@ -14,7 +14,7 @@ public:
void setEditing(bool isEditing, bool reinitDraftBuffer = true);
bool isEditing() const;
/* Warning: this function is VERY dangerous! Indeed: sometimes the
* m_expressionLayoutField might overflow the m_textBuffer once serialized
* m_layoutField might overflow the m_textBuffer once serialized
* and still have been accepted before because the model can hold a longer
* buffer. This is the case in the application 'Calculation' and we do not
* use text() there... TODO: change text() for fillTextInBuffer?*/

2
escher/src/layout_field.cpp
View File

@@ -139,7 +139,7 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
}
if (Responder::handleEvent(event)) {
/* The only event Responder handles is 'Toolbox' displaying. In that case,
* the ExpressionLayoutField is forced into editing mode. */
* the LayoutField is forced into editing mode. */
if (!isEditing()) {
setEditing(true);
}