FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

sliding text clock: BUGFIX - clock is blancj after 2nd settings update

pull/2178/head
adrian w kirk 2022-09-30 10:37:29 +01:00
parent 9e1ca8c88e
commit dbda3be396
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/slidingtext/slidingtext.js
View File

@ -316,12 +316,13 @@ function initDisplay(settings) {
if(settings == null){ if(settings == null){
settings = {}; settings = {};
} }
row_type_overide = date_formatter.defaultRowTypes(); var row_type_overide = date_formatter.defaultRowTypes();
mergeMaps(row_types,row_type_overide); mergeMaps(row_types,row_type_overide);
mergeMaps(row_types,settings.row_types); mergeMaps(row_types,settings.row_types);
var row_defs = (settings.row_defs != null)? settings.row_defs : date_formatter.defaultRowDefs(); var row_defs = (settings.row_defs != null && !settings.row_defs.isEmpty())?
row_displays = []; settings.row_defs : date_formatter.defaultRowDefs();
row_displays = [];
for(var i=0; i< row_defs.length; i++){ for(var i=0; i< row_defs.length; i++){
var row_def = row_defs[i]; var row_def = row_defs[i];
var row_type_val = row_types[row_def.type]; var row_type_val = row_types[row_def.type];
@ -356,8 +357,9 @@ function mergeObjects(obj1, obj2){
const heights = { const heights = {
vsmall: [15,10], vsmall: [20,15],
small: [25,20], small: [25,20],
msmall: [30,22],
medium: [40,25], medium: [40,25],
large: [50,40], large: [50,40],
vlarge: [60,50] vlarge: [60,50]

5
apps/slidingtext/slidingtext.settings.js
View File

@ -14,6 +14,9 @@
row_types: { row_types: {
large:{ large:{
angle_to_horizontal: 90 angle_to_horizontal: 90
},
medium: {
size: 'msmall'
} }
}, },
row_defs: [ row_defs: [
@ -100,7 +103,7 @@
if(styling.row_types != null) if(styling.row_types != null)
settings.row_types = styling.row_types; settings.row_types = styling.row_types;
settings.row_defs = {}; settings.delete("row_defs");
if(styling.row_defs != null) if(styling.row_defs != null)
settings.row_defs = styling.row_defs; settings.row_defs = styling.row_defs;