Skip to content

Commit 2f71d57

Browse files
committed
added new clock style
1 parent 319eff2 commit 2f71d57

File tree

3 files changed

+28
-6
lines changed

3 files changed

+28
-6
lines changed

SucroseProperties.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@
239239
"items": [
240240
"None",
241241
"Horizontal",
242-
"Vertical"
242+
"Vertical (2*2)",
243+
"Vertical (1*4)"
243244
]
244245
},
245246
"ui_clock_24hourformat": {

js/index.js

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,9 @@ window.onload = function () {
725725
hour = "0" + hour;
726726
if (minute < 10)
727727
minute = "0" + minute;
728+
729+
hour = hour.toString();
730+
minute = minute.toString();
728731
}
729732

730733
//MARK: Mask
@@ -750,22 +753,36 @@ window.onload = function () {
750753

751754
switch (options.ui_clock_clock) {
752755
case "1": {
756+
let clock = hour + ":" + minute;
753757
if (options.ui_clock_scale > 0) {
754758
let center = [Math.floor((columns - 17 * options.ui_clock_scale) / 2), Math.floor((rows - 5 * options.ui_clock_scale) / 2)];
755-
drawTextOnMask(hour + ":" + minute, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY, options.ui_clock_scale);
759+
drawTextOnMask(clock, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY, options.ui_clock_scale);
756760
} else {
757761
let center = [Math.floor((columns - 5) / 2), Math.floor((rows - 1) / 2)];
758-
drawTextOnMatrix(hour + ":" + minute, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY);
762+
drawTextOnMatrix(clock, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY);
759763
}
760764
break;
761765
}
762766
case "2": {
767+
let clock = hour + "\\n" + minute;
763768
if (options.ui_clock_scale > 0) {
764769
let center = [Math.floor((columns - 7 * options.ui_clock_scale) / 2), Math.floor((rows - 11 * options.ui_clock_scale) / 2)];
765-
drawTextOnMask(hour + "\\n" + minute, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY, options.ui_clock_scale);
770+
drawTextOnMask(clock, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY, options.ui_clock_scale);
766771
} else {
767772
let center = [Math.floor((columns - 2) / 2), Math.floor((rows - 2) / 2)];
768-
drawTextOnMatrix(hour + "\\n" + minute, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY);
773+
drawTextOnMatrix(clock, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY);
774+
}
775+
break;
776+
}
777+
case "3": {
778+
let h = hour.split("").join("\\n"), m = minute.split("").join("\\n");
779+
let clock = h + "\\n" + m;
780+
if (options.ui_clock_scale > 0) {
781+
let center = [Math.floor((columns - 3 * options.ui_clock_scale) / 2), Math.floor((rows - 23 * options.ui_clock_scale) / 2)];
782+
drawTextOnMask(clock, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY, options.ui_clock_scale);
783+
} else {
784+
let center = [Math.floor((columns - 1) / 2), Math.floor((rows - 4) / 2)];
785+
drawTextOnMatrix(clock, center[0] + options.ui_clock_positionX, center[1] + options.ui_clock_positionY);
769786
}
770787
break;
771788
}

project.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,12 @@
502502
"value" : "1"
503503
},
504504
{
505-
"label" : "Vertical",
505+
"label" : "Vertical (2*2)",
506506
"value" : "2"
507+
},
508+
{
509+
"label" : "Vertical (1*4)",
510+
"value" : "3"
507511
}
508512
],
509513
"order" : 130,

0 commit comments

Comments
 (0)