Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

gpstrek - Reimplement scrolling for overview

master
Martin Boonk 2023-06-08 22:13:09 +02:00
parent 6ed7db97be
commit b027e220bd
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/gpstrek/app.js
View File

@ -813,23 +813,22 @@ let onAction = function(_,xy){
} else { } else {
mapLiveScale *= 1.5; mapLiveScale *= 1.5;
} }
} else if (xy && xy.y > Bangle.appRect.y){ } else if (isMapOverview && xy && xy.y > Bangle.appRect.y){
isMapOverview = !isMapOverview; scrolling = !scrolling;
if (!isMapOverview){
mapOverviewX = g.getWidth()/2;
mapOverviewY = g.getHeight()/2;
}
} }
startDrawing(); startDrawing();
} }
}; };
let scrolling = false;
let onSwipe = function(dirLR,dirUD){ let onSwipe = function(dirLR,dirUD){
let s = WIDGETS.gpstrek.getState(); let s = WIDGETS.gpstrek.getState();
clearTaskQueue(); clearTaskQueue();
forceMapRedraw = true; forceMapRedraw = true;
if (s.mode == MODE_MAP){ if (s.mode == MODE_MAP){
if (!scrolling){
if (dirLR > 0) { if (dirLR > 0) {
switchMode(MODE_MENU); switchMode(MODE_MENU);
} else if (dirLR < 0) { } else if (dirLR < 0) {
@ -837,8 +836,17 @@ let onSwipe = function(dirLR,dirUD){
} }
if (dirUD){ if (dirUD){
isMapOverview = !isMapOverview; isMapOverview = !isMapOverview;
if (!isMapOverview){
mapOverviewX = g.getWidth()/2;
mapOverviewY = g.getHeight()/2;
scrolling = false;
}
startDrawing(); startDrawing();
} }
} else {
mapOverviewX += dirLR * SETTINGS.overviewScroll;
mapOverviewY += dirUD * SETTINGS.overviewScroll;
}
} else if (s.mode == MODE_SLICES){ } else if (s.mode == MODE_SLICES){
if (dirLR > 0) { if (dirLR > 0) {
if (s.route){ if (s.route){
@ -863,23 +871,6 @@ let onSwipe = function(dirLR,dirUD){
} }
} }
} }
/*
if (WIDGETS.gpstrek.getState().route && global.screen == 1 && isMapOverview){
stopDrawing();
if (dirLR) mapOverviewX += SETTINGS.overviewScroll*dirLR;
if (dirUD) mapOverviewY += SETTINGS.overviewScroll*dirUD;
startDrawing();
} else {
if (dirUD < 0) {
nextSlicePage();
} else if (dirUD > 0) {
prevSlicePage();
} else {
nextScreen();
}
}*/
}; };