UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-20 09:17:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/calculation] Make calculation views dynamically allocated

Browse Source 
Change-Id: I45946e46203bd8dde21793ee2395c76dc15db06c
This commit is contained in:
Émilie Feral
2017-04-19 10:58:58 +02:00
parent 50aacc79ec
commit 80873cf025
5 changed files with 88 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
apps/calculation/edit_expression_controller.cpp
View File

@@ -44,30 +44,25 @@ TableView * EditExpressionController::ContentView::mainView() {
}
EditExpressionController::EditExpressionController(Responder * parentResponder, HistoryController * historyController, CalculationStore * calculationStore) :
ViewController(parentResponder),
m_contentView(this, (TableView *)historyController->view(), this),
DynamicViewController(parentResponder),
m_historyController(historyController),
m_calculationStore(calculationStore)
{
}
View * EditExpressionController::view() {
return &m_contentView;
}
const char * EditExpressionController::textBody() {
return m_contentView.textField()->text();
return ((ContentView *)view())->textField()->text();
}
void EditExpressionController::setTextBody(const char * text) {
m_contentView.textField()->setEditing(true);
m_contentView.textField()->setText(text);
((ContentView *)view())->textField()->setEditing(true);
((ContentView *)view())->textField()->setText(text);
}
bool EditExpressionController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Up) {
if (m_calculationStore->numberOfCalculations() > 0) {
m_contentView.textField()->setEditing(false, false);
((ContentView *)view())->textField()->setEditing(false, false);
app()->setFirstResponder(m_historyController);
}
return true;
@@ -76,23 +71,25 @@ bool EditExpressionController::handleEvent(Ion::Events::Event event) {
}
void EditExpressionController::didBecomeFirstResponder() {
m_contentView.textField()->setEditing(true, false);
app()->setFirstResponder(m_contentView.textField());
int lastRow = m_calculationStore->numberOfCalculations() > 0 ? m_calculationStore->numberOfCalculations()-1 : 0;
m_historyController->scrollToCell(0, lastRow);
((ContentView *)view())->textField()->setEditing(true, false);
app()->setFirstResponder(((ContentView *)view())->textField());
}
bool EditExpressionController::textFieldDidFinishEditing(::TextField * textField, const char * text) {
App * calculationApp = (App *)app();
m_calculationStore->push(textBody(), calculationApp->localContext());
m_historyController->reload();
m_contentView.mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
m_contentView.textField()->setEditing(true);
m_contentView.textField()->setText("");
((ContentView *)view())->mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
((ContentView *)view())->textField()->setEditing(true);
((ContentView *)view())->textField()->setText("");
return true;
}
bool EditExpressionController::textFieldDidAbortEditing(::TextField * textField, const char * text) {
m_contentView.textField()->setEditing(true);
m_contentView.textField()->setText(text);
((ContentView *)view())->textField()->setEditing(true);
((ContentView *)view())->textField()->setText(text);
return false;
}
@@ -100,4 +97,18 @@ TextFieldDelegateApp * EditExpressionController::textFieldDelegateApp() {
return (App *)app();
}
void EditExpressionController::loadView() {
m_historyController->loadView();
DynamicViewController::loadView();
}
void EditExpressionController::unloadView() {
m_historyController->unloadView();
DynamicViewController::unloadView();
}
View * EditExpressionController::createView() {
return new ContentView(this, (TableView *)m_historyController->view(), this);
}
}