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] correct how tab controllers handle events

Browse Source 
Change-Id: I22e312193e4a382f8f6998bac80425386d76b7f8
This commit is contained in:
Émilie Feral
2016-09-16 11:22:19 +02:00
parent bc9e504394
commit 2fed1c6a16
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
escher/src/tab_view_controller.cpp
View File

@@ -88,9 +88,7 @@ bool TabViewController::handleEvent(Ion::Events::Event event) {
}
return true;
case Ion::Events::Event::ENTER:
if (m_selectedChildIndex != m_activeChildIndex) {
setActiveTab(m_selectedChildIndex);
}
return true;
default:
return false;
@@ -110,14 +108,13 @@ TabViewController::TabViewController(ViewController ** children, uint8_t numberO
*/
void TabViewController::setActiveTab(int8_t i) {
if (i == m_activeChildIndex) {
return;
}
//TODO assert(i <= m_numberOfchildren);
ViewController * activeVC = m_children[i];
m_view.setActiveView(activeVC->view());
m_view.m_tabView.setActiveIndex(i);
m_activeChildIndex = i;
if (i != m_activeChildIndex) {
//TODO assert(i <= m_numberOfchildren);
m_view.setActiveView(activeVC->view());
m_view.m_tabView.setActiveIndex(i);
m_activeChildIndex = i;
}
app()->setFirstResponder(activeVC);
}