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/shared] In values controller, update the number of columns when

Browse Source 
layout is done

Change-Id: I29bc776623ff2e5056c9f2cc1d995b4440996116
This commit is contained in:
Émilie Feral
2017-06-07 10:44:14 +02:00
parent d28a9e4664
commit bf11591e3e
12 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/shared/values_controller.cpp
View File

@@ -8,14 +8,14 @@ using namespace Poincare;
namespace Shared {
ValuesController::ValuesController(Responder * parentResponder, ButtonRowController * header, I18n::Message parameterTitle, IntervalParameterController * intervalParameterController, Interval * interval, uint32_t * modelVersion) :
ValuesController::ValuesController(Responder * parentResponder, ButtonRowController * header, I18n::Message parameterTitle, IntervalParameterController * intervalParameterController, Interval * interval) :
EditableCellTableViewController(parentResponder),
ButtonRowDelegate(header, nullptr),
m_interval(interval),
m_numberOfColumns(0),
m_numberOfColumnsNeedUpdate(true),
m_abscissaTitleCell(nullptr),
m_abscissaCells{},
m_modelVersion(modelVersion),
m_abscissaParameterController(this, intervalParameterController, parameterTitle),
m_setIntervalButton(this, I18n::Message::IntervalSet, Invocation([](void * context, void * sender) {
ValuesController * valuesController = (ValuesController *) context;
@@ -30,6 +30,10 @@ const char * ValuesController::title() {
}
int ValuesController::numberOfColumns() {
if (m_numberOfColumnsNeedUpdate) {
updateNumberOfColumns();
m_numberOfColumnsNeedUpdate = false;
}
return m_numberOfColumns;
}
@@ -228,15 +232,15 @@ Responder * ValuesController::defaultController() {
}
void ValuesController::viewWillAppear() {
uint32_t newModelVersion = functionStore()->storeChecksum();
if (*m_modelVersion != newModelVersion) {
*m_modelVersion = newModelVersion;
updateNumberOfColumns();
}
EditableCellTableViewController::viewWillAppear();
header()->setSelectedButton(-1);
}
void ValuesController::viewDidDisappear() {
m_numberOfColumnsNeedUpdate = true;
EditableCellTableViewController::viewDidDisappear();
}
Function * ValuesController::functionAtColumn(int i) {
assert(i > 0);
return functionStore()->activeFunctionAtIndex(i-1);
@@ -319,7 +323,7 @@ void ValuesController::unloadView(View * view) {
}
void ValuesController::updateNumberOfColumns() {
m_numberOfColumns = 1+functionStore()->numberOfActiveFunctions();
m_numberOfColumns = 1+functionStore()->numberOfActiveFunctions();
}
}