[apps/shared] In list controller, factorize handle event

Change-Id: I0e00f1cf3b217782ec6f858d60954733e2be5276
This commit is contained in:
Émilie Feral
2017-02-17 14:37:54 +01:00
parent 828e4795b9
commit cfd518283f
6 changed files with 94 additions and 123 deletions

View File

@@ -37,54 +37,6 @@ KDCoordinate ListController::rowHeight(int j) {
return functionSize + k_emptyRowHeight - KDText::stringSize(" ").height();
}
bool ListController::handleEvent(Ion::Events::Event event) {
if (Shared::ListController::handleEvent(event)) {
return true;
}
if (event == Ion::Events::OK) {
return handleEnter();
}
if ((!event.hasText() && event != Ion::Events::XNT)
|| m_selectableTableView.selectedColumn() == 0
|| (m_selectableTableView.selectedRow() == numberOfRows() - 1
&& m_functionStore->numberOfFunctions() < m_functionStore->maxNumberOfFunctions())) {
return false;
}
Shared::Function * function = m_functionStore->functionAtIndex(m_selectableTableView.selectedRow());
editExpression(function, event);
return true;
}
bool ListController::handleEnter() {
switch (m_selectableTableView.selectedColumn()) {
case 0:
{
if (m_functionStore->numberOfFunctions() < m_functionStore->maxNumberOfFunctions() &&
m_selectableTableView.selectedRow() == numberOfRows() - 1) {
return true;
}
configureFunction(m_functionStore->functionAtIndex(m_selectableTableView.selectedRow()));
return true;
}
case 1:
{
if (m_functionStore->numberOfFunctions() < m_functionStore->maxNumberOfFunctions() &&
m_selectableTableView.selectedRow() == numberOfRows() - 1) {
m_functionStore->addEmptyFunction();
m_selectableTableView.reloadData();
return true;
}
Shared::Function * function = m_functionStore->functionAtIndex(m_selectableTableView.selectedRow());
editExpression(function, Ion::Events::OK);
return true;
}
default:
{
return false;
}
}
}
void ListController::editExpression(Function * function, Ion::Events::Event event) {
char * initialText = nullptr;
char initialTextContent[255];