fixed travis build error in toucher, rordered options in App Manager, back first

pull/848/head
hughbarney 2021-10-18 22:17:31 +01:00
parent cbfd73e122
commit 09c2718d52
2 changed files with 11 additions and 11 deletions

View File

@ -7,13 +7,9 @@ function showMainMenu() {
'': { '': {
'title': 'App Manager', 'title': 'App Manager',
}, },
'Free': { '< Back': ()=> {load();},
value: undefined, 'Sort Apps': () => showSortAppsMenu(),
format: (v) => { 'Manage Apps': ()=> showApps(),
return store.getFree();
},
onchange: () => {}
},
'Compact': () => { 'Compact': () => {
E.showMessage('Compacting...'); E.showMessage('Compacting...');
try { try {
@ -22,9 +18,13 @@ function showMainMenu() {
} }
showMainMenu(); showMainMenu();
}, },
'Apps': ()=> showApps(), 'Free': {
'Sort Apps': () => showSortAppsMenu(), value: undefined,
'< Back': ()=> {load();} format: (v) => {
return store.getFree();
},
onchange: () => {}
},
}; };
E.showMenu(mainmenu); E.showMenu(mainmenu);
} }

View File

@ -140,7 +140,7 @@ function render(){
g.setColor(g.theme.fg); g.setColor(g.theme.fg);
if (cycle == 2 && scale > 0.1) { if (cycle == 2 && scale > 0.1) {
const fontSize = (process.env.HWVERSION == 2) ? 2 : 1; let fontSize = (process.env.HWVERSION == 2) ? 2 : 1;
if (process.env.HWVERSION == 1) { if (process.env.HWVERSION == 1) {
fontSize = (settings.highres) ? 3 : 1; fontSize = (settings.highres) ? 3 : 1;
} }