UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/escher/toolbox] handleEventWithText for all responders.

Browse Source 
This makes the code in the various toolbox more generic. The arguments
of the text to insert are each replaced by a Ion::Charset::Empty.
These Empty chars are used to create layouts in ExpressionLayoutFields,
and to compute the position of the cursor in other fields, before being
removed.

Change-Id: Ie81c1e394b06fef2ab801ccff919d6550f70ec30
This commit is contained in:
Léa Saviot
2018-04-23 14:57:46 +02:00
parent 643aa89f74
commit 13ae1d2545
23 changed files with 153 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
apps/math_toolbox.cpp
View File

@@ -108,67 +108,21 @@ const ToolboxMessageTree toolboxModel = ToolboxMessageTree(I18n::Message::Toolbo
#endif
MathToolbox::MathToolbox() :
Toolbox(nullptr, I18n::translate(rootModel()->label())),
m_action(actionForTextInput)
Toolbox(nullptr, I18n::translate(rootModel()->label()))
{
}
void MathToolbox::setSenderAndAction(Responder * sender, Action action) {
setSender(sender);
m_action = action;
}
void MathToolbox::actionForExpressionLayoutField(void * sender, const char * text, bool removeArguments) {
ExpressionLayoutField * expressionLayoutEditorSender = static_cast<ExpressionLayoutField *>(sender);
Expression * resultExpression = nullptr;
if (removeArguments) {
// Replace the arguments with Empty chars.
int textToInsertMaxLength = strlen(text);
char textToInsert[textToInsertMaxLength];
Shared::ToolboxHelpers::TextToParseIntoLayoutForCommandText(text, textToInsert, textToInsertMaxLength);
// Create the layout
resultExpression = Expression::parse(textToInsert);
} else {
resultExpression = Expression::parse(text);
}
if (resultExpression == nullptr) {
return;
}
ExpressionLayout * resultLayout = resultExpression->createLayout();
// Find the pointed layout.
ExpressionLayout * pointedLayout = nullptr;
if (resultLayout->isHorizontal()) {
// If the layout is horizontal, pick the first open parenthesis.
// For now, all horizontal layouts in MathToolbox have parentheses.
for (int i = 0; i < resultLayout->numberOfChildren(); i++) {
if (resultLayout->editableChild(i)->isLeftParenthesis()) {
pointedLayout = resultLayout->editableChild(i);
break;
}
}
}
// Insert the layout. If pointedLayout is nullptr, the cursor will be on the
// right of the inserted layout.
expressionLayoutEditorSender->insertLayoutAtCursor(resultLayout, pointedLayout);
}
void MathToolbox::actionForTextInput(void * sender, const char * text, bool removeArguments) {
TextInput * textInputSender = static_cast<TextInput *>(sender);
if (removeArguments) {
int maxTextToInsertLength = strlen(text);
char textToInsert[maxTextToInsertLength];
// Translate the message and remove the arguments.
Shared::ToolboxHelpers::TextToInsertForCommandText(text, textToInsert, maxTextToInsertLength);
textInputSender->handleEventWithText(textToInsert);
} else {
textInputSender->handleEventWithText(text);
}
}
bool MathToolbox::selectLeaf(ToolboxMessageTree * selectedMessageTree) {
ToolboxMessageTree * messageTree = selectedMessageTree;
m_selectableTableView.deselectTable();
m_action(sender(), I18n::translate(messageTree->insertedText()), true);
// Translate the message and remove the arguments
const char * text = I18n::translate(messageTree->insertedText());
int maxTextToInsertLength = strlen(text) + 1;
char textToInsert[maxTextToInsertLength];
Shared::ToolboxHelpers::TextToInsertForCommandText(text, textToInsert, maxTextToInsertLength, true);
sender()->handleEventWithText(textToInsert);
app()->dismissModalViewController();
return true;
}