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] Extrude scroll view model to its delegate

Browse Source 
Change-Id: If863de63f5f77edb5e2905633067e03aecdd8937
This commit is contained in:
Émilie Feral
2017-04-28 14:05:32 +02:00
parent 3f98061a4c
commit 0517066cc0
42 changed files with 148 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/shared/float_parameter_controller.cpp
View File

@@ -14,26 +14,26 @@ FloatParameterController::FloatParameterController(Responder * parentResponder)
}
void FloatParameterController::didBecomeFirstResponder() {
if (selectableTableView()->selectedRow() >= 0) {
int selectedRow = selectableTableView()->selectedRow();
selectedRow = selectedRow >= numberOfRows() ? numberOfRows()-1 : selectedRow;
int selectedColumn = selectableTableView()->selectedColumn();
selectedColumn = selectedColumn >= numberOfColumns() ? numberOfColumns() - 1 : selectedColumn;
selectCellAtLocation(selectedColumn, selectedRow);
if (selectedRow() >= 0) {
int selRow = selectedRow();
selRow = selRow >= numberOfRows() ? numberOfRows()-1 : selRow;
int selColumn = selectedColumn();
selColumn = selColumn >= numberOfColumns() ? numberOfColumns() - 1 : selColumn;
selectCellAtLocation(selColumn, selRow);
}
app()->setFirstResponder(selectableTableView());
}
void FloatParameterController::viewWillAppear() {
selectableTableView()->reloadData();
if (selectableTableView()->selectedRow() == -1) {
if (selectedRow() == -1) {
selectCellAtLocation(0, 0);
} else {
int selectedRow = selectableTableView()->selectedRow();
selectedRow = selectedRow >= numberOfRows() ? numberOfRows()-1 : selectedRow;
int selectedColumn = selectableTableView()->selectedColumn();
selectedColumn = selectedColumn >= numberOfColumns() ? numberOfColumns() - 1 : selectedColumn;
selectCellAtLocation(selectedColumn, selectedRow);
int selRow = selectedRow();
selRow = selRow >= numberOfRows() ? numberOfRows()-1 : selRow;
int selColumn = selectedColumn();
selColumn = selColumn >= numberOfColumns() ? numberOfColumns() - 1 : selColumn;
selectCellAtLocation(selColumn, selRow);
}
}
@@ -108,8 +108,8 @@ void FloatParameterController::willDisplayCellForIndex(HighlightCell * cell, int
}
bool FloatParameterController::textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) {
return (event == Ion::Events::Down && selectableTableView()->selectedRow() < numberOfRows()-1)
|| (event == Ion::Events::Up && selectableTableView()->selectedRow() > 0)
return (event == Ion::Events::Down && selectedRow() < numberOfRows()-1)
|| (event == Ion::Events::Up && selectedRow() > 0)
|| TextFieldDelegate::textFieldShouldFinishEditing(textField, event);
}
@@ -121,13 +121,13 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField,
app()->displayWarning(I18n::Message::UndefinedValue);
return false;
}
if (!setParameterAtIndex(selectableTableView()->selectedRow(), floatBody)) {
if (!setParameterAtIndex(selectedRow(), floatBody)) {
return false;
}
willDisplayCellForIndex(selectableTableView()->selectedCell(), activeCell());
selectableTableView()->reloadData();
if (event == Ion::Events::EXE || event == Ion::Events::OK) {
selectableTableView()->selectCellAtLocation(selectableTableView()->selectedColumn(), selectableTableView()->selectedRow()+1);
selectableTableView()->selectCellAtLocation(selectedColumn(), selectedRow()+1);
} else {
selectableTableView()->handleEvent(event);
}
@@ -166,7 +166,7 @@ TextFieldDelegateApp * FloatParameterController::textFieldDelegateApp() {
}
int FloatParameterController::activeCell() {
return selectableTableView()->selectedRow();
return selectedRow();
}
void FloatParameterController::unloadView() {