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

[escher] Prevent superfluous layout clearings

Browse Source
This commit is contained in:
Léa Saviot
2018-09-20 16:11:27 +02:00
parent f5418e077e
commit 6b8d8a1e55
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/calculation/edit_expression_controller.cpp
View File

@@ -160,8 +160,7 @@ bool EditExpressionController::inputViewDidFinishEditing(const char * text, Layo
m_calculationStore->push(m_cacheBuffer, calculationApp->localContext());
m_historyController->reload();
((ContentView *)view())->mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
((ContentView *)view())->expressionField()->setEditing(true);
((ContentView *)view())->expressionField()->setText("");
((ContentView *)view())->expressionField()->setEditing(true, true);
return true;
}

4
escher/src/layout_field.cpp
View File

@@ -185,9 +185,7 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
}
if (isEditing() && m_delegate->layoutFieldShouldFinishEditing(this, event)) { //TODO use class method?
setEditing(false);
if (m_delegate->layoutFieldDidFinishEditing(this, layout(), event)) {
clearLayout();
}
m_delegate->layoutFieldDidFinishEditing(this, layout(), event);
return true;
}
if ((event == Ion::Events::OK || event == Ion::Events::EXE) && !isEditing()) {