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] Define LayoutFieldDelegate::expressionFieldDelegateApp() directly from ::app()

Browse Source
This commit is contained in:
Ruben Dashyan
2019-06-06 17:38:01 +02:00
committed by EmilieNumworks
parent 0490e3ab81
commit 5058f64163
8 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/calculation/edit_expression_controller.cpp
View File

@@ -112,10 +112,6 @@ TextFieldDelegateApp * EditExpressionController::textFieldDelegateApp() {
return app();
}
ExpressionFieldDelegateApp * EditExpressionController::expressionFieldDelegateApp() {
return app();
}
void EditExpressionController::reloadView() {
((ContentView *)view())->reload();
m_historyController->reload();

1
apps/calculation/edit_expression_controller.h
View File

@@ -54,7 +54,6 @@ private:
bool inputViewDidFinishEditing(const char * text, Poincare::Layout layoutR);
bool inputViewDidAbortEditing(const char * text);
Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
static constexpr int k_cacheBufferSize = Constant::MaxSerializedExpressionSize;
char m_cacheBuffer[k_cacheBufferSize];
HistoryController * m_historyController;

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

@@ -162,10 +162,6 @@ TextFieldDelegateApp * ListController::textFieldDelegateApp() {
return app();
}
ExpressionFieldDelegateApp * ListController::expressionFieldDelegateApp() {
return app();
}
ListParameterController * ListController::parameterController() {
return &m_parameterController;
}

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

@@ -29,7 +29,6 @@ private:
static constexpr KDCoordinate k_expressionCellVerticalMargin = 3;
bool editInitialConditionOfSelectedRecordWithText(const char * text, bool firstInitialCondition);
Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
ListParameterController * parameterController() override;
int maxNumberOfDisplayableRows() override;
Shared::FunctionTitleCell * titleCells(int index) override;

5
apps/shared/layout_field_delegate.h
View File

@@ -1,7 +1,6 @@
#ifndef SHARED_LAYOUT_FIELD_DELEGATE_H
#define SHARED_LAYOUT_FIELD_DELEGATE_H
#include <escher/layout_field_delegate.h>
#include "expression_field_delegate_app.h"
namespace Shared {
@@ -14,7 +13,9 @@ public:
bool layoutFieldDidAbortEditing(LayoutField * layoutField) override;
void layoutFieldDidChangeSize(LayoutField * layoutField) override;
private:
virtual ExpressionFieldDelegateApp * expressionFieldDelegateApp() = 0;
ExpressionFieldDelegateApp * expressionFieldDelegateApp() {
return static_cast<ExpressionFieldDelegateApp *>(::app());
}
};
}

4
apps/solver/list_controller.cpp
View File

@@ -232,10 +232,6 @@ Shared::TextFieldDelegateApp * ListController::textFieldDelegateApp() {
return app();
}
Shared::ExpressionFieldDelegateApp * ListController::expressionFieldDelegateApp() {
return app();
}
StackViewController * ListController::stackController() const {
return static_cast<StackViewController *>(parentResponder()->parentResponder());
}

1
apps/solver/list_controller.h
View File

@@ -39,7 +39,6 @@ public:
View * view() override { return &m_equationListView; }
/* Text/Layout Field Delegate */
Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
bool textFieldDidReceiveEvent(TextField * textField, 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;

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

@@ -1,8 +1,8 @@
#ifndef ESCHER_LAYOUT_FIELD_DELEGATE_H
#define ESCHER_LAYOUT_FIELD_DELEGATE_H
#include <escher/toolbox.h>
#include <ion/events.h>
#include <poincare/layout.h>
class LayoutField;