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] Fix bug in variable box controller

Browse Source 
Change-Id: If5080b961aa44bea124dcf73efc09b1c16bc75b1
This commit is contained in:
Émilie Feral
2017-05-11 17:46:28 +02:00
parent a07b4ffd8c
commit 3ba4ddbd85
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/variable_box_controller.cpp
View File

@@ -42,14 +42,14 @@ bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Even
app()->dismissModalViewController();
return true;
}
m_selectableTableView.deselectTable();
m_firstSelectedRow = m_previousSelectedRow;
#if MATRIX_LIST_VARIABLES
m_currentPage = Page::RootMenu;
#endif
app()->setFirstResponder(this);
return true;
}
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
m_selectableTableView.deselectTable();
if (m_currentPage == Page::RootMenu) {
m_previousSelectedRow = selectedRow();
m_firstSelectedRow = 0;
@@ -66,7 +66,9 @@ bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Even
}
m_textFieldCaller->insertTextAtLocation(editedText, m_textFieldCaller->cursorLocation());
m_textFieldCaller->setCursorLocation(m_textFieldCaller->cursorLocation() + strlen(editedText));
#if MATRIX_LIST_VARIABLES
m_currentPage = Page::RootMenu;
#endif
app()->dismissModalViewController();
return true;
}
@@ -239,10 +241,6 @@ void VariableBoxController::ContentViewController::resetPage() {
#endif
}
void VariableBoxController::ContentViewController::deselectTable() {
m_selectableTableView.deselectTable();
}
VariableBoxController::VariableBoxController(Context * context) :
StackViewController(nullptr, &m_contentViewController, true, KDColorWhite, Palette::PurpleBright, Palette::PurpleDark),
m_contentViewController(ContentViewController(this, context))
@@ -265,5 +263,4 @@ void VariableBoxController::viewWillAppear() {
void VariableBoxController::viewDidDisappear() {
StackViewController::viewDidDisappear();
m_contentViewController.deselectTable();
}