UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 14:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Event 'right' on chevron cells behaves as OK and 'left' on the

Browse Source 
next cell as 'back'

Change-Id: I2470659d8237373b21ad106c79cc5f8945f0edb5
This commit is contained in:
Émilie Feral
2017-06-01 16:41:55 +02:00
parent 62fdda45bf
commit ce09d2f9c4
12 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/variable_box_controller.cpp
View File

@@ -32,16 +32,16 @@ void VariableBoxController::ContentViewController::didBecomeFirstResponder() {
}
bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Back) {
#if MATRIX_LIST_VARIABLES
if (m_currentPage == Page::RootMenu) {
if (event == Ion::Events::Back && m_currentPage == Page::RootMenu) {
#else
if (m_currentPage == Page::Scalar) {
if (event == Ion::Events::Back && m_currentPage == Page::Scalar) {
#endif
m_firstSelectedRow = 0;
app()->dismissModalViewController();
return true;
}
m_firstSelectedRow = 0;
app()->dismissModalViewController();
return true;
}
if (event == Ion::Events::Back || event == Ion::Events::Left) {
m_firstSelectedRow = m_previousSelectedRow;
#if MATRIX_LIST_VARIABLES
m_currentPage = Page::RootMenu;
@@ -49,8 +49,8 @@ bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Even
app()->setFirstResponder(this);
return true;
}
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
if (m_currentPage == Page::RootMenu) {
if (event == Ion::Events::OK || event == Ion::Events::EXE || (event == Ion::Events::Right && m_currentPage == Page::RootMenu)) {
if (m_currentPage == Page::RootMenu) {
m_previousSelectedRow = selectedRow();
m_firstSelectedRow = 0;
m_currentPage = pageAtIndex(selectedRow());