Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

JS: Widget icons without path, just name

Browse Source
This commit is contained in:
Willy-JL
2024-03-28 22:28:52 +00:00
parent a94a1a96ae
commit a1eeeb245f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/system/js_app/examples/apps/Scripts/widget.js
+2 -2
View File
@@ -34,8 +34,8 @@ widget.addDot(102, 44);
widget.addDot(104, 43);
// add an icon (x, y, icon)
widget.addIcon(100, 55, "Common/ButtonUp_7x4");
widget.addIcon(100, 60, "Common/ButtonDown_7x4");
widget.addIcon(100, 50, "ButtonUp_7x4");
widget.addIcon(100, 55, "ButtonDown_7x4");
// add a glyph (x, y, glyph)
widget.addGlyph(120, 50, 0x23);
applications/system/js_app/modules/js_widget.c
+6 -2
View File
@@ -3,6 +3,7 @@
#include <gui/view.h>
#include <m-array.h>
#include <m-list.h>
#include <string.h>
#include "../js_modules.h"
typedef struct WidgetComponent WidgetComponent;
@@ -505,8 +506,11 @@ static void js_widget_add_icon(struct mjs* mjs) {
const Icon* icon = NULL;
for(size_t i = 0; i < ICON_PATHS_COUNT; i++) {
if(ICON_PATHS[i].path != NULL && strnlen(ICON_PATHS[i].path, icon_len + 2) == icon_len &&
strncmp(icon_name, ICON_PATHS[i].path, icon_len) == 0) {
if(ICON_PATHS[i].path == NULL) continue;
const char* iter_name = strrchr(ICON_PATHS[i].path, '/');
if(iter_name++ == NULL) continue;
if(strnlen(iter_name, icon_len + 1) == icon_len &&
strncmp(iter_name, icon_name, icon_len) == 0) {
icon = ICON_PATHS[i].icon;
break;
}