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

Merge pull request #2351 from halemmerich/widgetutils 

widget_utils - Allow setting a time for hiding on swipeOn
master
Gordon Williams 2022-12-05 09:52:59 +00:00 committed by GitHub
parent 6dda2fc7f1 dba3511e2a
commit 5f35b3a061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/imageclock/app.js
View File

@ -627,7 +627,7 @@ s.pl = {};
Bangle.drawWidgets = ()=>{}; Bangle.drawWidgets = ()=>{};
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets = orig; Bangle.drawWidgets = orig;
require("widget_utils").swipeOn(); require("widget_utils").swipeOn(0);
Bangle.drawWidgets(); Bangle.drawWidgets();
} }
}).catch((e)=>{ }).catch((e)=>{

15
modules/widget_utils.js
View File

@ -29,6 +29,7 @@ exports.show = function() {
/// Remove any intervals/handlers/etc that we might have added. Does NOT re-show widgets that were hidden /// Remove any intervals/handlers/etc that we might have added. Does NOT re-show widgets that were hidden
exports.cleanup = function() { exports.cleanup = function() {
delete exports.autohide;
delete Bangle.appRect; delete Bangle.appRect;
if (exports.swipeHandler) { if (exports.swipeHandler) {
Bangle.removeListener("swipe", exports.swipeHandler); Bangle.removeListener("swipe", exports.swipeHandler);
@ -50,11 +51,13 @@ exports.cleanup = function() {
/** Put widgets offscreen, and allow them to be swiped /** Put widgets offscreen, and allow them to be swiped
back onscreen with a downwards swipe. Use .show to undo. back onscreen with a downwards swipe. Use .show to undo.
First parameter controls automatic hiding time, 0 equals not hiding at all.
Default value is 2000ms until hiding.
Bangle.js 2 only at the moment. */ Bangle.js 2 only at the moment. */
exports.swipeOn = function() { exports.swipeOn = function(autohide) {
exports.cleanup(); exports.cleanup();
if (!global.WIDGETS) return; if (!global.WIDGETS) return;
exports.autohide=autohide===undefined?2000:autohide;
/* TODO: maybe when widgets are offscreen we don't even /* TODO: maybe when widgets are offscreen we don't even
store them in an offscreen buffer? */ store them in an offscreen buffer? */
@ -125,11 +128,13 @@ exports.swipeOn = function() {
clearTimeout(exports.hideTimeout); clearTimeout(exports.hideTimeout);
delete exports.hideTimeout; delete exports.hideTimeout;
} }
if (ud>0 && offset<0) anim(4, function() { let cb;
if (exports.autohide > 0) cb = function() {
exports.hideTimeout = setTimeout(function() { exports.hideTimeout = setTimeout(function() {
anim(-4); anim(-4);
}, 2000); }, exports.autohide);
}); }
if (ud>0 && offset<0) anim(4, cb);
if (ud<0 && offset>-24) anim(-4); if (ud<0 && offset>-24) anim(-4);
}; };