Fixed some conflicts

This commit is contained in:
Quentin Guidée
2020-02-12 17:42:58 +01:00
687 changed files with 13048 additions and 4057 deletions

View File

@@ -78,8 +78,8 @@ View * NestedMenuController::ListController::view() {
void NestedMenuController::ListController::didBecomeFirstResponder() {
m_selectableTableView->reloadData();
m_selectableTableView->selectCellAtLocation(0, m_firstSelectedRow);
Container::activeApp()->setFirstResponder(m_selectableTableView);
m_selectableTableView->selectCellAtLocation(0, m_firstSelectedRow);
}
void NestedMenuController::ListController::setFirstSelectedRow(int firstSelectedRow) {