UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Define InputEventHandlerDelegate::inputEventHandlerDelegateApp() directly from ::app()

Browse Source
This commit is contained in:
Ruben Dashyan
2019-06-06 17:28:33 +02:00
committed by EmilieNumworks
parent 4111927bae
commit 0490e3ab81
6 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/code/editor_controller.cpp
View File

@@ -114,10 +114,6 @@ VariableBoxController * EditorController::variableBoxForInputEventHandler(InputE
return varBox; return varBox;
} }
InputEventHandlerDelegateApp * EditorController::inputEventHandlerDelegateApp() {
return app();
}
StackViewController * EditorController::stackController() { StackViewController * EditorController::stackController() {
return static_cast<StackViewController *>(parentResponder()); return static_cast<StackViewController *>(parentResponder());
} }

1
apps/code/editor_controller.h
View File

@@ -33,7 +33,6 @@ public:
VariableBoxController * variableBoxForInputEventHandler(InputEventHandler * textInput) override; VariableBoxController * variableBoxForInputEventHandler(InputEventHandler * textInput) override;
private: private:
Shared::InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() override;
static constexpr int k_indentationSpacesNumber = 2; //TODO LEA merge with text area k_indentationSpaces static constexpr int k_indentationSpacesNumber = 2; //TODO LEA merge with text area k_indentationSpaces
StackViewController * stackController(); StackViewController * stackController();
void saveScript(); void saveScript();

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

@@ -166,10 +166,6 @@ ExpressionFieldDelegateApp * ListController::expressionFieldDelegateApp() {
return app(); return app();
} }
InputEventHandlerDelegateApp * ListController::inputEventHandlerDelegateApp() {
return app();
}
ListParameterController * ListController::parameterController() { ListParameterController * ListController::parameterController() {
return &m_parameterController; return &m_parameterController;
} }

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

@@ -30,7 +30,6 @@ private:
bool editInitialConditionOfSelectedRecordWithText(const char * text, bool firstInitialCondition); bool editInitialConditionOfSelectedRecordWithText(const char * text, bool firstInitialCondition);
Shared::TextFieldDelegateApp * textFieldDelegateApp() override; Shared::TextFieldDelegateApp * textFieldDelegateApp() override;
Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override; Shared::ExpressionFieldDelegateApp * expressionFieldDelegateApp() override;
Shared::InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() override;
ListParameterController * parameterController() override; ListParameterController * parameterController() override;
int maxNumberOfDisplayableRows() override; int maxNumberOfDisplayableRows() override;
Shared::FunctionTitleCell * titleCells(int index) override; Shared::FunctionTitleCell * titleCells(int index) override;

5
apps/shared/input_event_handler_delegate.h
View File

@@ -1,7 +1,6 @@
#ifndef SHARED_INPUT_EVENT_HANDLER_DELEGATE_H #ifndef SHARED_INPUT_EVENT_HANDLER_DELEGATE_H
#define SHARED_INPUT_EVENT_HANDLER_DELEGATE_H #define SHARED_INPUT_EVENT_HANDLER_DELEGATE_H
#include <escher.h>
#include "input_event_handler_delegate_app.h" #include "input_event_handler_delegate_app.h"
namespace Shared { namespace Shared {
@@ -11,7 +10,9 @@ public:
Toolbox * toolboxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->toolboxForInputEventHandler(textInput); } Toolbox * toolboxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->toolboxForInputEventHandler(textInput); }
NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->variableBoxForInputEventHandler(textInput); } NestedMenuController * variableBoxForInputEventHandler(InputEventHandler * textInput) override { return inputEventHandlerDelegateApp()->variableBoxForInputEventHandler(textInput); }
private: private:
virtual InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() = 0; InputEventHandlerDelegateApp * inputEventHandlerDelegateApp() {
return static_cast<InputEventHandlerDelegateApp *>(::app());
}
}; };
} }

3
apps/shared/input_event_handler_delegate_app.h
View File

@@ -1,7 +1,8 @@
#ifndef SHARED_INPUT_EVENT_HANDLER_DELEGATE_APP_H #ifndef SHARED_INPUT_EVENT_HANDLER_DELEGATE_APP_H
#define SHARED_INPUT_EVENT_HANDLER_DELEGATE_APP_H #define SHARED_INPUT_EVENT_HANDLER_DELEGATE_APP_H
#include <escher.h> #include <escher/app.h>
#include <escher/input_event_handler_delegate.h>
namespace Shared { namespace Shared {