UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-29 19:49:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Improvements of MVC structure regarding curve views and ranges

Browse Source 
Change-Id: Iec8031dbf349c34c18694dffabd02ef9c88ebf2d
This commit is contained in:
Émilie Feral
2017-01-17 17:42:30 +01:00
parent 72de9990e9
commit c3008ca360
42 changed files with 343 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/interactive_curve_view_controller.cpp
View File

@@ -40,7 +40,7 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Down) {
headerViewController()->setSelectedButton(-1);
curveView()->selectMainView(true);
curveView()->reloadSelection();
curveView()->reload();
reloadBannerView();
return true;
}
@@ -65,36 +65,25 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
}
if (event == Ion::Events::Left || event == Ion::Events::Right) {
int direction = event == Ion::Events::Left ? -1 : 1;
curveView()->reloadSelection();
int didMoveCursor = moveCursorHorizontally(direction);
if (didMoveCursor == 0) {
curveView()->reloadSelection();
}
if (didMoveCursor == 1) {
if (moveCursorHorizontally(direction)) {
curveView()->reload();
reloadBannerView();
return true;
}
reloadBannerView();
return (didMoveCursor >= 0);
return false;
}
if (event == Ion::Events::Down || event == Ion::Events::Up) {
int direction = event == Ion::Events::Down ? -1 : 1;
curveView()->reloadSelection();
int didMoveCursor = moveCursorVertically(direction);
if (didMoveCursor < 0) {
if (event == Ion::Events::Down) {
return false;
}
curveView()->selectMainView(false);
headerViewController()->setSelectedButton(0);
if (moveCursorVertically(direction)) {
curveView()->reload();
reloadBannerView();
return true;
}
if (didMoveCursor == 0) {
curveView()->reloadSelection();
if (event == Ion::Events::Down) {
return false;
}
if (didMoveCursor == 1) {
curveView()->reload();
}
reloadBannerView();
curveView()->selectMainView(false);
headerViewController()->setSelectedButton(0);
return true;
}
if (event == Ion::Events::OK) {