[apps/shared] Make tab table controller dynamic view controller

Change-Id: Id3a383e72173779eb295dc998f780041f62f8bf0
This commit is contained in:
Émilie Feral
2017-04-19 17:42:36 +02:00
parent 9295a5f107
commit 5c7d763291
19 changed files with 333 additions and 134 deletions

View File

@@ -22,12 +22,12 @@ bool EditableCellTableViewController::textFieldDidFinishEditing(TextField * text
app()->displayWarning(I18n::Message::UndefinedValue);
return false;
}
if (!setDataAtLocation(floatBody, m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow())) {
if (!setDataAtLocation(floatBody, selectableTableView()->selectedColumn(), selectableTableView()->selectedRow())) {
app()->displayWarning(I18n::Message::ForbiddenValue);
return false;
}
m_selectableTableView.reloadData();
m_selectableTableView.selectCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow()+1);
selectableTableView()->reloadData();
selectableTableView()->selectCellAtLocation(selectableTableView()->selectedColumn(), selectableTableView()->selectedRow()+1);
return true;
}
@@ -86,26 +86,26 @@ void EditableCellTableViewController::willDisplayCellAtLocationWithDisplayMode(H
}
void EditableCellTableViewController::didBecomeFirstResponder() {
if (m_selectableTableView.selectedRow() >= 0) {
int selectedRow = m_selectableTableView.selectedRow();
if (selectableTableView()->selectedRow() >= 0) {
int selectedRow = selectableTableView()->selectedRow();
selectedRow = selectedRow >= numberOfRows() ? numberOfRows()-1 : selectedRow;
int selectedColumn = m_selectableTableView.selectedColumn();
int selectedColumn = selectableTableView()->selectedColumn();
selectedColumn = selectedColumn >= numberOfColumns() ? numberOfColumns() - 1 : selectedColumn;
m_selectableTableView.selectCellAtLocation(selectedColumn, selectedRow);
selectableTableView()->selectCellAtLocation(selectedColumn, selectedRow);
TabTableController::didBecomeFirstResponder();
}
}
void EditableCellTableViewController::viewWillAppear() {
TabTableController::viewWillAppear();
if (m_selectableTableView.selectedRow() == -1) {
m_selectableTableView.selectCellAtLocation(0, 1);
if (selectableTableView()->selectedRow() == -1) {
selectableTableView()->selectCellAtLocation(0, 1);
} else {
int selectedRow = m_selectableTableView.selectedRow();
int selectedRow = selectableTableView()->selectedRow();
selectedRow = selectedRow >= numberOfRows() ? numberOfRows()-1 : selectedRow;
int selectedColumn = m_selectableTableView.selectedColumn();
int selectedColumn = selectableTableView()->selectedColumn();
selectedColumn = selectedColumn >= numberOfColumns() ? numberOfColumns() - 1 : selectedColumn;
m_selectableTableView.selectCellAtLocation(selectedColumn, selectedRow);
selectableTableView()->selectCellAtLocation(selectedColumn, selectedRow);
}
}