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/poincare] Handle toolbox input (VERY DIRTY).

Browse Source 
Change-Id: I01de0ddd6f6500df278e3b4104110f6335289be1
This commit is contained in:
Léa Saviot
2017-12-20 15:24:50 +01:00
parent c24de3c069
commit 0d8b6d5ace
9 changed files with 100 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/math_toolbox.cpp
View File

@@ -9,8 +9,8 @@
* subtree, the edited text is set at I18n::Message::Default. */
const ToolboxMessageTree calculChildren[4] = {
ToolboxMessageTree(I18n::Message::DiffCommandWithArg, I18n::Message::DerivateNumber, I18n::Message::DiffCommandWithArg),
ToolboxMessageTree(I18n::Message::IntCommandWithArg, I18n::Message::Integral, I18n::Message::IntCommandWithArg),
ToolboxMessageTree(I18n::Message::DiffCommandWithArg, I18n::Message::DerivateNumber, I18n::Message::DiffCommandWithArg, nullptr, 0),
ToolboxMessageTree(I18n::Message::IntCommandWithArg, I18n::Message::Integral, I18n::Message::IntCommandWithArg, nullptr, 0, new IntegralLayout(new EmptyVisibleLayout(), new EmptyVisibleLayout, new HorizontalLayout(const_cast<Poincare::ExpressionLayout**>(Poincare::ExpressionLayout::ExpressionLayoutArray2(new EmptyVisibleLayout(), new StringLayout("dx",2))), 2, false), false)),
ToolboxMessageTree(I18n::Message::SumCommandWithArg, I18n::Message::Sum, I18n::Message::SumCommandWithArg),
ToolboxMessageTree(I18n::Message::ProductCommandWithArg, I18n::Message::Product, I18n::Message::ProductCommandWithArg)};
@@ -102,22 +102,34 @@ MathToolbox::MathToolbox() : Toolbox(nullptr, I18n::translate(rootModel()->label
{
}
TextField * MathToolbox::sender() {
return (TextField *)Toolbox::sender();
TextField * MathToolbox::textFieldSender() {
return static_cast<TextField *>(Toolbox::sender());
}
ExpressionEditor::Controller * MathToolbox::expressionEditorControllerSender() {
return static_cast<ExpressionEditor::Controller *>(Toolbox::sender());
}
bool MathToolbox::selectLeaf(ToolboxMessageTree * selectedMessageTree) {
m_selectableTableView.deselectTable();
ToolboxMessageTree * messageTree = selectedMessageTree;
const char * editedText = I18n::translate(messageTree->insertedText());
if (!sender()->isEditing()) {
sender()->setEditing(true);
if (0) {
m_selectableTableView.deselectTable();
ToolboxMessageTree * messageTree = selectedMessageTree;
const char * editedText = I18n::translate(messageTree->insertedText());
if (!textFieldSender()->isEditing()) {
textFieldSender()->setEditing(true);
}
char strippedEditedText[strlen(editedText)];
Shared::ToolboxHelpers::TextToInsertForCommandMessage(messageTree->insertedText(), strippedEditedText);
textFieldSender()->insertTextAtLocation(strippedEditedText, textFieldSender()->cursorLocation());
int newCursorLocation = textFieldSender()->cursorLocation() + Shared::ToolboxHelpers::CursorIndexInCommand(strippedEditedText);
textFieldSender()->setCursorLocation(newCursorLocation);
app()->dismissModalViewController();
return true;
}
char strippedEditedText[strlen(editedText)];
Shared::ToolboxHelpers::TextToInsertForCommandMessage(messageTree->insertedText(), strippedEditedText);
sender()->insertTextAtLocation(strippedEditedText, sender()->cursorLocation());
int newCursorLocation = sender()->cursorLocation() + Shared::ToolboxHelpers::CursorIndexInCommand(strippedEditedText);
sender()->setCursorLocation(newCursorLocation);
// Deal with ExpressionEditor::Controller for now.
m_selectableTableView.deselectTable();
ExpressionLayout * newLayout = selectedMessageTree->layout()->clone();
expressionEditorControllerSender()->insertLayoutAtCursor(newLayout, newLayout->editableChild(2)->editableChild(0));
app()->dismissModalViewController();
return true;
}