UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-24 00:00:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Substitute Escher app() by Container::activeApp()

Browse Source
This commit is contained in:
Ruben Dashyan
2019-07-18 16:10:26 +02:00
committed by EmilieNumworks
parent 1a2a651f36
commit 44809f4b3f
101 changed files with 181 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
escher/src/nested_menu_controller.cpp
View File

@@ -79,7 +79,7 @@ View * NestedMenuController::ListController::view() {
void NestedMenuController::ListController::didBecomeFirstResponder() {
m_selectableTableView->reloadData();
m_selectableTableView->selectCellAtLocation(0, m_firstSelectedRow);
app()->setFirstResponder(m_selectableTableView);
Container::activeApp()->setFirstResponder(m_selectableTableView);
}
void NestedMenuController::ListController::setFirstSelectedRow(int firstSelectedRow) {
@@ -103,7 +103,7 @@ bool NestedMenuController::handleEvent(Ion::Events::Event event) {
}
void NestedMenuController::didBecomeFirstResponder() {
app()->setFirstResponder(&m_listController);
Container::activeApp()->setFirstResponder(&m_listController);
}
void NestedMenuController::viewWillAppear() {
@@ -155,7 +155,7 @@ bool NestedMenuController::handleEventForRow(Ion::Events::Event event, int rowIn
bool NestedMenuController::selectSubMenu(int selectedRow) {
m_stack.push(selectedRow, m_selectableTableView.contentOffset().y());
m_listController.setFirstSelectedRow(0);
app()->setFirstResponder(&m_listController);
Container::activeApp()->setFirstResponder(&m_listController);
return true;
}
@@ -165,6 +165,6 @@ bool NestedMenuController::returnToPreviousMenu() {
m_listController.setFirstSelectedRow(state.selectedRow());
KDPoint scroll = m_selectableTableView.contentOffset();
m_selectableTableView.setContentOffset(KDPoint(scroll.x(), state.verticalScroll()));
app()->setFirstResponder(&m_listController);
Container::activeApp()->setFirstResponder(&m_listController);
return true;
}