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

Merge branch 'SaisieJolieRebase1201' into SaisieJolieMerge10Apr

Browse Source 
Change-Id: I802dbb9f7c0eebf75a1b6cd21ddd194e89b53752
This commit is contained in:
Léa Saviot
2018-04-10 17:21:54 +02:00
parent 3e66d51a6e 90068b5cc7
commit c4b5d4cf40
212 changed files with 7429 additions and 1510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/shared/function_app.cpp
View File

@@ -53,7 +53,7 @@ void FunctionApp::Snapshot::reset() {
}
FunctionApp::FunctionApp(Container * container, Snapshot * snapshot, ViewController * rootViewController) :
TextFieldDelegateApp(container, snapshot, rootViewController)
EditableExpressionViewDelegateApp(container, snapshot, rootViewController)
{
}
@@ -62,7 +62,7 @@ void FunctionApp::willBecomeInactive() {
m_modalViewController.dismissModalViewController();
}
if (inputViewController()->isDisplayingModal()) {
inputViewController()->abortTextFieldEditionAndDismiss();
inputViewController()->abortEditionAndDismiss();
}
::App::willBecomeInactive();
}