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

[apps/code] ConsoleController: when becoming first responder, check if a

Browse Source 
controller is displayed and switch the first responder accordingly
This commit is contained in:
Émilie Feral
2020-03-24 17:13:22 +01:00
parent 7e73afc654
commit 89b54d424e
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/code/console_controller.cpp
View File

@@ -190,7 +190,16 @@ void ConsoleController::viewWillAppear() {
}
void ConsoleController::didBecomeFirstResponder() {
Container::activeApp()->setFirstResponder(&m_editCell);
if (viewControllerIsDisplayed(nullptr)) {
Container::activeApp()->setFirstResponder(&m_editCell);
} else {
/* A view controller might be displayed: for example, when pushing the
* console on the stack controller, we auto-import scripts during the
* 'viewWillAppear' and then we set the console as first responder. The
* sandbox or the matplotlib controller might have been pushed in the
* auto-import. */
Container::activeApp()->setFirstResponder(m_displayedViewController);
}
}
bool ConsoleController::handleEvent(Ion::Events::Event event) {