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

[escher] Clean tab view controller

Browse Source 
Change-Id: Ia56e0d9d4efd9bad87e7ef4c7a183f0c7efedaad
This commit is contained in:
Émilie Feral
2017-05-31 12:21:46 +02:00
parent fe9e6ec59a
commit 747bcb808a
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
escher/src/tab_view_controller.cpp
View File

@@ -98,31 +98,27 @@ bool TabViewController::handleEvent(Ion::Events::Event event) {
return true;
}
if (event == Ion::Events::Down) {
setActiveTab(m_dataSource->activeTab(), false);
setActiveTab(m_dataSource->activeTab());
return true;
}
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
setActiveTab(m_dataSource->selectedTab(), true);
setActiveTab(m_dataSource->selectedTab());
return true;
}
return false;
}
void TabViewController::setActiveTab(int8_t i, bool forceReactive) {
void TabViewController::setActiveTab(int8_t i) {
assert(i >= 0 && i < m_numberOfChildren);
ViewController * activeVC = m_children[i];
if (i != m_dataSource->activeTab() || forceReactive) {
if (i != m_dataSource->activeTab()) {
m_view.setActiveView(activeVC->view());
m_children[i]->viewWillAppear();
}
if (i != m_dataSource->activeTab()) {
m_view.setActiveView(activeVC->view());
m_children[i]->viewWillAppear();
m_view.m_tabView.setActiveIndex(i);
}
app()->setFirstResponder(activeVC);
if (i != m_dataSource->activeTab() || forceReactive) {
if (m_dataSource->activeTab() >= 0 && m_dataSource->activeTab() != i) {
m_children[m_dataSource->activeTab()]->viewDidDisappear();
}
if (i != m_dataSource->activeTab()) {
m_children[m_dataSource->activeTab()]->viewDidDisappear();
m_dataSource->setActiveTab(i);
}
}