UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +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

14
apps/calculation/history_controller.cpp
View File

@@ -24,7 +24,7 @@ void HistoryController::reload() {
void HistoryController::didBecomeFirstResponder() {
selectCellAtLocation(0, numberOfRows()-1);
app()->setFirstResponder(&m_selectableTableView);
Container::activeApp()->setFirstResponder(&m_selectableTableView);
}
void HistoryController::willExitResponderChain(Responder * nextFirstResponder) {
@@ -36,7 +36,7 @@ void HistoryController::willExitResponderChain(Responder * nextFirstResponder) {
bool HistoryController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Down) {
m_selectableTableView.deselectTable();
app()->setFirstResponder(parentResponder());
Container::activeApp()->setFirstResponder(parentResponder());
return true;
}
if (event == Ion::Events::Up) {
@@ -48,7 +48,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
SubviewType subviewType = selectedSubviewType();
EditExpressionController * editController = (EditExpressionController *)parentResponder();
m_selectableTableView.deselectTable();
app()->setFirstResponder(editController);
Container::activeApp()->setFirstResponder(editController);
Calculation * calculation = m_calculationStore->calculationAtIndex(focusRow);
if (subviewType == SubviewType::Input) {
editController->insertTextBody(calculation->inputText());
@@ -72,7 +72,7 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
m_calculationStore->deleteCalculationAtIndex(focusRow);
reload();
if (numberOfRows()== 0) {
app()->setFirstResponder(editController);
Container::activeApp()->setFirstResponder(editController);
return true;
}
if (focusRow > 0) {
@@ -92,13 +92,13 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
m_selectableTableView.deselectTable();
m_calculationStore->deleteAll();
reload();
app()->setFirstResponder(parentResponder());
Container::activeApp()->setFirstResponder(parentResponder());
return true;
}
if (event == Ion::Events::Back) {
EditExpressionController * editController = (EditExpressionController *)parentResponder();
m_selectableTableView.deselectTable();
app()->setFirstResponder(editController);
Container::activeApp()->setFirstResponder(editController);
return true;
}
return false;
@@ -120,7 +120,7 @@ void HistoryController::tableViewDidChangeSelection(SelectableTableView * t, int
if (selectedCell == nullptr) {
return;
}
app()->setFirstResponder(selectedCell);
Container::activeApp()->setFirstResponder(selectedCell);
}
int HistoryController::numberOfRows() {