[apps/sequence]Correct sequence toolbox

Change-Id: Ifbe1c45f6002604b248bcb072d57c08808e5c5b0
This commit is contained in:
Émilie Feral
2017-02-20 10:39:25 +01:00
parent 8311e8857c
commit 704dd22fbc
4 changed files with 29 additions and 16 deletions

View File

@@ -125,18 +125,7 @@ void MathToolbox::didBecomeFirstResponder() {
}
bool MathToolbox::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Back) {
return returnToPreviousMenu();
}
if (event == Ion::Events::OK) {
int selectedRow = m_selectableTableView.selectedRow();
ToolboxNode * selectedNode = (ToolboxNode *)m_nodeModel->children(selectedRow);
if (selectedNode->numberOfChildren() == 0) {
return selectLeaf(selectedNode);
}
return selectSubMenu(selectedNode);
}
return false;
return handleEventForRow(event, m_selectableTableView.selectedRow());
}
int MathToolbox::numberOfRows() {
@@ -225,6 +214,20 @@ TextField * MathToolbox::sender() {
return (TextField *)Toolbox::sender();
}
bool MathToolbox::handleEventForRow(Ion::Events::Event event, int selectedRow) {
if (event == Ion::Events::Back) {
return returnToPreviousMenu();
}
if (event == Ion::Events::OK) {
ToolboxNode * selectedNode = (ToolboxNode *)m_nodeModel->children(selectedRow);
if (selectedNode->numberOfChildren() == 0) {
return selectLeaf(selectedNode);
}
return selectSubMenu(selectedNode);
}
return false;
}
const ToolboxNode * MathToolbox::rootModel() {
return &toolboxModel;
}