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

[escher] Clean Field and Input class hierarchy:

Browse Source 
Class hierarchy:
- InputEventHandler
- TextInput
- EditableField derives from InputEventHandler
- LayoutField, TextField and ExpressioField derives from EditableField
- TextArea and TextField derives from TextInput
This commit is contained in:
Émilie Feral
2018-10-19 14:31:50 +02:00
parent c2adbe28c5
commit 01e433a9f2
36 changed files with 123 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/shared/text_field_delegate_app.cpp
View File

@@ -41,7 +41,7 @@ bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::
return false;
}
Toolbox * TextFieldDelegateApp::toolboxForTextInput(TextInput * textInput) {
Toolbox * TextFieldDelegateApp::toolboxForTextInput(InputEventHandler * textInput) {
Toolbox * toolbox = container()->mathToolbox();
toolbox->setSender(textInput);
return toolbox;
@@ -49,12 +49,12 @@ Toolbox * TextFieldDelegateApp::toolboxForTextInput(TextInput * textInput) {
/* Protected */
bool TextFieldDelegateApp::fieldDidReceiveEvent(Field * field, Responder * responder, Ion::Events::Event event) {
bool TextFieldDelegateApp::fieldDidReceiveEvent(EditableField * field, Responder * responder, Ion::Events::Event event) {
if (event == Ion::Events::Var) {
forceEdition(field);
AppsContainer * appsContainer = (AppsContainer *)responder->app()->container();
VariableBoxController * variableBoxController = appsContainer->variableBoxController();
variableBoxController->setSender(responder);
variableBoxController->setSender(field);
responder->app()->displayModalViewController(variableBoxController, 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
return true;
@@ -62,12 +62,12 @@ bool TextFieldDelegateApp::fieldDidReceiveEvent(Field * field, Responder * respo
if (event == Ion::Events::XNT) {
forceEdition(field);
const char xnt[2] = {field->XNTChar(XNT()), 0};
return responder->handleEventWithText(xnt);
return field->handleEventWithText(xnt);
}
return false;
}
void TextFieldDelegateApp::forceEdition(Field * field) {
void TextFieldDelegateApp::forceEdition(EditableField * field) {
if (!field->isEditing()) {
field->setEditing(true);
}