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] Fixed bug in MathToolbox.

Browse Source 
When returning a MathToolbox, the textfield delegate did not set the
toolbox action for textfields.

Change-Id: I51f78ff5601f784be8e283cf3fb6d3462b776d9a
This commit is contained in:
Léa Saviot
2018-01-17 14:10:37 +01:00
parent d8803c610c
commit 3154decf8b
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/math_toolbox.cpp
View File

@@ -107,7 +107,7 @@ const ToolboxMessageTree toolboxModel = ToolboxMessageTree(I18n::Message::Toolbo
MathToolbox::MathToolbox() :
Toolbox(nullptr, I18n::translate(rootModel()->label())),
m_action(actionForTextfield)
m_action(actionForTextField)
{
}
@@ -152,7 +152,7 @@ void MathToolbox::actionForEditableExpressionView(void * sender, ToolboxMessageT
expressionLayoutEditorSender->insertLayoutAtCursor(resultLayout, pointedLayout);
}
void MathToolbox::actionForTextfield(void * sender, ToolboxMessageTree * messageTree) {
void MathToolbox::actionForTextField(void * sender, ToolboxMessageTree * messageTree) {
TextField * textFieldSender = static_cast<TextField *>(sender);
if (!textFieldSender->isEditing()) {
textFieldSender->setEditing(true);

2
apps/math_toolbox.h
View File

@@ -12,7 +12,7 @@ public:
MathToolbox();
void setSenderAndAction(Responder * sender, Action action);
static void actionForEditableExpressionView(void * sender, ToolboxMessageTree * messageTree);
static void actionForTextfield(void * sender, ToolboxMessageTree * messageTree);
static void actionForTextField(void * sender, ToolboxMessageTree * messageTree);
protected:
bool selectLeaf(ToolboxMessageTree * selectedMessageTree) override;
const ToolboxMessageTree * rootModel() override;

4
apps/shared/text_field_delegate_app.cpp
View File

@@ -110,7 +110,9 @@ bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::
}
Toolbox * TextFieldDelegateApp::toolboxForTextField(TextField * textField) {
return container()->mathToolbox();
Toolbox * toolbox = container()->mathToolbox();
static_cast<MathToolbox *>(toolbox)->setSenderAndAction(textField, MathToolbox::actionForTextField);
return toolbox;
}
}