UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 16:57:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] In variable controller, improve hiding of lists and matrices

Browse Source 
variables

Change-Id: Ib09718b675d7f96be91572134e48173defa39db1
This commit is contained in:
Émilie Feral
2017-05-02 14:15:23 +02:00
parent a64b30f0ef
commit 824bc8aed9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/variable_box_controller.cpp
View File

@@ -33,8 +33,11 @@ void VariableBoxController::ContentViewController::didBecomeFirstResponder() {
bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Back) {
/* TODO: implement matrix and list contexts */
if (m_currentPage == Page::Scalar) {//if (m_currentPage == Page::RootMenu) {
#if MATRIX_LIST_VARIABLES
if (m_currentPage == Page::RootMenu) {
#else
if (m_currentPage == Page::Scalar) {
#endif
m_firstSelectedRow = 0;
app()->dismissModalViewController();
return true;
@@ -125,6 +128,7 @@ void VariableBoxController::ContentViewController::willDisplayCellForIndex(Highl
}
myCell->displayExpression(true);
if (expression) {
/* TODO: implement matrix and list contexts */
//myCell->setExpression(expression->createLayout());
// TODO: display the dimensgion of the list/matrice as subtitle
/* char buffer[4];
@@ -228,8 +232,11 @@ void VariableBoxController::ContentViewController::reloadData() {
}
void VariableBoxController::ContentViewController::resetPage() {
/* TODO: implement matrix and list contexts */
m_currentPage = Page::Scalar;//Page::RootMenu;
#if MATRIX_LIST_VARIABLES
m_currentPage = Page::RootMenu;
#else
m_currentPage = Page::Scalar;
#endif
}
void VariableBoxController::ContentViewController::deselectTable() {