diff --git a/apps/float_parameter_controller.cpp b/apps/float_parameter_controller.cpp index 0f29080cf..e7bd42c54 100644 --- a/apps/float_parameter_controller.cpp +++ b/apps/float_parameter_controller.cpp @@ -1,6 +1,7 @@ #include "float_parameter_controller.h" #include "constant.h" #include "apps_container.h" +#include "text_field_delegate_app.h" #include FloatParameterController::FloatParameterController(Responder * parentResponder) : @@ -40,6 +41,11 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField, return true; } +bool FloatParameterController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) { + TextFieldDelegateApp * myApp = (TextFieldDelegateApp *)app(); + return myApp->textFieldDidReceiveEvent(textField, event); +} + void FloatParameterController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) { EditableTextMenuListCell * myCell = (EditableTextMenuListCell *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY); myCell->setEditing(false); diff --git a/apps/float_parameter_controller.h b/apps/float_parameter_controller.h index a5fec9b4c..f662e4add 100644 --- a/apps/float_parameter_controller.h +++ b/apps/float_parameter_controller.h @@ -16,6 +16,7 @@ public: KDCoordinate cellHeight() override; void willDisplayCellForIndex(TableViewCell * cell, int index) override; bool textFieldDidFinishEditing(TextField * textField, const char * text) override; + bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) override; protected: int activeCell(); diff --git a/apps/graph/graph/goto_parameter_controller.cpp b/apps/graph/graph/goto_parameter_controller.cpp index 56572345e..cf38a6931 100644 --- a/apps/graph/graph/goto_parameter_controller.cpp +++ b/apps/graph/graph/goto_parameter_controller.cpp @@ -48,9 +48,4 @@ void GoToParameterController::setFunction(Function * function) { m_function = function; } -bool GoToParameterController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) { - App * myApp = (App *)app(); - return myApp->textFieldDidReceiveEvent(textField, event); -} - } diff --git a/apps/graph/graph/goto_parameter_controller.h b/apps/graph/graph/goto_parameter_controller.h index f3ca7c7c5..1872e5b1a 100644 --- a/apps/graph/graph/goto_parameter_controller.h +++ b/apps/graph/graph/goto_parameter_controller.h @@ -15,7 +15,6 @@ public: TableViewCell * reusableCell(int index) override; int reusableCellCount() override; void setFunction(Function * function); - bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; private: float parameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override; diff --git a/apps/graph/graph/window_parameter_controller.cpp b/apps/graph/graph/window_parameter_controller.cpp index 320523e68..ccdeb2e3b 100644 --- a/apps/graph/graph/window_parameter_controller.cpp +++ b/apps/graph/graph/window_parameter_controller.cpp @@ -134,9 +134,4 @@ int WindowParameterController::reusableCellCount() { return k_numberOfTextCell+1; } -bool WindowParameterController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) { - App * myApp = (App *)app(); - return myApp->textFieldDidReceiveEvent(textField, event); -} - } diff --git a/apps/graph/graph/window_parameter_controller.h b/apps/graph/graph/window_parameter_controller.h index 128e09c00..979a26166 100644 --- a/apps/graph/graph/window_parameter_controller.h +++ b/apps/graph/graph/window_parameter_controller.h @@ -19,7 +19,6 @@ public: bool textFieldDidFinishEditing(TextField * textField, const char * text) override; void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) override; bool handleEvent(Ion::Events::Event event) override; - bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; private: float parameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override; diff --git a/apps/graph/values/interval_parameter_controller.cpp b/apps/graph/values/interval_parameter_controller.cpp index d92281697..34d6fcbb0 100644 --- a/apps/graph/values/interval_parameter_controller.cpp +++ b/apps/graph/values/interval_parameter_controller.cpp @@ -71,9 +71,4 @@ int IntervalParameterController::reusableCellCount() { return k_totalNumberOfCell; } -bool IntervalParameterController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) { - App * myApp = (App *)app(); - return myApp->textFieldDidReceiveEvent(textField, event); -} - } diff --git a/apps/graph/values/interval_parameter_controller.h b/apps/graph/values/interval_parameter_controller.h index 6337577d4..43ff644c4 100644 --- a/apps/graph/values/interval_parameter_controller.h +++ b/apps/graph/values/interval_parameter_controller.h @@ -16,7 +16,6 @@ public: int numberOfRows() override; TableViewCell * reusableCell(int index) override; int reusableCellCount() override; - bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; private: float parameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override; diff --git a/apps/probability/parameters_controller.cpp b/apps/probability/parameters_controller.cpp index 0aece2923..0552a23ff 100644 --- a/apps/probability/parameters_controller.cpp +++ b/apps/probability/parameters_controller.cpp @@ -185,10 +185,5 @@ void ParametersController::setParameterAtIndex(int parameterIndex, float f) { m_law->setParameterAtIndex(f, parameterIndex); } -bool ParametersController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) { - App * myApp = (App *)app(); - return myApp->textFieldDidReceiveEvent(textField, event); -} - } diff --git a/apps/probability/parameters_controller.h b/apps/probability/parameters_controller.h index febfc50b7..84b3a5b8e 100644 --- a/apps/probability/parameters_controller.h +++ b/apps/probability/parameters_controller.h @@ -23,7 +23,6 @@ public: void willDisplayCellForIndex(TableViewCell * cell, int index) override; TableViewCell * reusableCell(int index) override; int reusableCellCount() override; - bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override; private: float parameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override;