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] Use a forgotten method on selectable table view

Browse Source 
Change-Id: I6b934ac0d2587565c6b94d5130d158b621c1e187
This commit is contained in:
Émilie Feral
2017-04-24 10:29:30 +02:00
parent 2b5e1c31bf
commit 230a53fe7e
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/selectable_table_view.cpp
View File

@@ -42,7 +42,7 @@ void CalculationSelectableTableView::scrollToSubviewOfTypeOfCellAtLocation(Histo
/* As we scroll, the selected calculation does not use the same history view
* cell, thus, we want to deselect the previous used history view cell. */
if (selectedRow() >= 0) {
HighlightCell * previousCell = cellAtLocation(selectedColumn(), selectedRow());
HighlightCell * previousCell = selectedCell();
previousCell->setHighlighted(false);
}
/* Main part of the scroll */

4
apps/regression/calculation_controller.cpp
View File

@@ -43,7 +43,7 @@ void CalculationController::didBecomeFirstResponder() {
if (selectableTableView()->selectedRow() == -1) {
selectableTableView()->selectCellAtLocation(1, 0);
} else {
selectableTableView()->selectCellAtLocation(selectableTableView()->selectedColumn(), selectableTableView()->selectedRow());
selectableTableView()->selectedCell();
}
TabTableController::didBecomeFirstResponder();
}
@@ -64,7 +64,7 @@ void CalculationController::tableViewDidChangeSelection(SelectableTableView * t,
}
}
if (t->selectedColumn() == 1 && t->selectedRow() >= 0 && t->selectedRow() < 6) {
EvenOddDoubleBufferTextCell * myCell = (EvenOddDoubleBufferTextCell *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
EvenOddDoubleBufferTextCell * myCell = (EvenOddDoubleBufferTextCell *)t->selectedCell();
bool firstSubCellSelected = true;
if (previousSelectedCellX == 1 && previousSelectedCellY >= 0 && previousSelectedCellY < 6) {
EvenOddDoubleBufferTextCell * myPreviousCell = (EvenOddDoubleBufferTextCell *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY);

2
apps/settings/sub_controller.cpp
View File

@@ -76,7 +76,7 @@ bool SubController::handleEvent(Ion::Events::Event event) {
if (m_selectableTableView.selectedRow() == 1) {
return false;
}
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.cellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow());
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
if (strcmp(myCell->accessoryText(), Ion::patchLevel()) == 0) {
myCell->setAccessoryText(Ion::softwareVersion());
return true;

2
apps/shared/editable_cell_table_view_controller.cpp
View File

@@ -54,7 +54,7 @@ void EditableCellTableViewController::tableViewDidChangeSelection(SelectableTabl
}
}
if (cellAtLocationIsEditable(t->selectedColumn(), t->selectedRow())) {
EvenOddEditableTextCell * myCell = (EvenOddEditableTextCell *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
EvenOddEditableTextCell * myCell = (EvenOddEditableTextCell *)t->selectedCell();
app()->setFirstResponder(myCell);
}
}

7
apps/shared/float_parameter_controller.cpp
View File

@@ -129,8 +129,7 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField,
if (!setParameterAtIndex(selectableTableView()->selectedRow(), floatBody)) {
return false;
}
willDisplayCellForIndex(selectableTableView()->cellAtLocation(selectableTableView()->selectedColumn(),
selectableTableView()->selectedRow()), activeCell());
willDisplayCellForIndex(selectableTableView()->selectedCell(), activeCell());
selectableTableView()->reloadData();
if (event == Ion::Events::EXE || event == Ion::Events::OK) {
selectableTableView()->selectCellAtLocation(selectableTableView()->selectedColumn(), selectableTableView()->selectedRow()+1);
@@ -157,12 +156,12 @@ void FloatParameterController::tableViewDidChangeSelection(SelectableTableView *
myCell->setEditing(false);
}
if (t->selectedRow() == numberOfRows()-1) {
Button * myNewCell = (Button *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
Button * myNewCell = (Button *)t->selectedCell();
app()->setFirstResponder(myNewCell);
return;
}
if (t->selectedRow() >= 0) {
MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->selectedCell();
app()->setFirstResponder(myNewCell);
}
}

2
apps/shared/range_parameter_controller.cpp
View File

@@ -78,7 +78,7 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView *
}
}
if (t->selectedRow() == numberOfRows()-1) {
Button * myNewCell = (Button *)t->cellAtLocation(t->selectedColumn(), t->selectedRow());
Button * myNewCell = (Button *)t->selectedCell();
app()->setFirstResponder(myNewCell);
return;
}