fix fullscreen with oneClickExit

master
Rarder44 2023-03-02 20:11:34 +01:00
parent 55bedf3207
commit f027b65e8e
3 changed files with 24 additions and 7 deletions

View File

@ -21,3 +21,4 @@
0.15: Ensure that we hide widgets if in fullscreen mode 0.15: Ensure that we hide widgets if in fullscreen mode
(So that widgets are still hidden if launcher is fast-loaded) (So that widgets are still hidden if launcher is fast-loaded)
0.16: Use firmware provided E.showScroller method 0.16: Use firmware provided E.showScroller method
0.17: fix fullscreen with oneClickExit

View File

@ -9,6 +9,7 @@
timeOut:"Off" timeOut:"Off"
}, s.readJSON("iconlaunch.json", true) || {}); }, s.readJSON("iconlaunch.json", true) || {});
if (!settings.fullscreen) { if (!settings.fullscreen) {
Bangle.loadWidgets(); Bangle.loadWidgets();
Bangle.drawWidgets(); Bangle.drawWidgets();
@ -103,15 +104,12 @@
}; };
const itemsN = Math.ceil(launchCache.apps.length / appsN); const itemsN = Math.ceil(launchCache.apps.length / appsN);
let back = ()=>{}; let idWatch = null;
if (settings.oneClickExit) back = Bangle.showClock;
let options = { let options = {
h: itemSize, h: itemSize,
c: itemsN, c: itemsN,
draw: drawItem, draw: drawItem,
select: selectItem, select: selectItem,
back: back,
remove: function() { remove: function() {
if (timeout) clearTimeout(timeout); if (timeout) clearTimeout(timeout);
Bangle.removeListener("drag", updateTimeout); Bangle.removeListener("drag", updateTimeout);
@ -120,8 +118,26 @@
if (settings.fullscreen) { // for fast-load, if we hid widgets then we should show them again if (settings.fullscreen) { // for fast-load, if we hid widgets then we should show them again
require("widget_utils").show(); require("widget_utils").show();
} }
} if(idWatch) clearWatch(idWatch);
},
btn:Bangle.showClock
}; };
//work both the fullscreen and the oneClickExit
if( settings.fullscreen && settings.oneClickExit)
{
idWatch=setWatch(function(e) {
Bangle.showClock();
}, BTN, {repeat:false, edge:'rising' });
}
else if( settings.oneClickExit )
{
options.back=Bangle.showClock;
}
let scroller = E.showScroller(options); let scroller = E.showScroller(options);
@ -141,4 +157,4 @@
Bangle.on("touch", updateTimeout); Bangle.on("touch", updateTimeout);
updateTimeout(); updateTimeout();
} }

View File

@ -2,7 +2,7 @@
"id": "iconlaunch", "id": "iconlaunch",
"name": "Icon Launcher", "name": "Icon Launcher",
"shortName" : "Icon launcher", "shortName" : "Icon launcher",
"version": "0.16", "version": "0.17",
"icon": "app.png", "icon": "app.png",
"description": "A launcher inspired by smartphones, with an icon-only scrollable menu.", "description": "A launcher inspired by smartphones, with an icon-only scrollable menu.",
"tags": "tool,system,launcher", "tags": "tool,system,launcher",