Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-31 02:23:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ofw/dev' into yeet-lfs

Browse Source
This commit is contained in:
Willy-JL
2024-08-12 19:57:49 +02:00
parent 98e2a221d5 99655c15e4
commit 5f98c5d986
139 changed files with 3552 additions and 1678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/system/js_app/modules/js_submenu.c
+1 -2
View File
@@ -97,10 +97,9 @@ static void js_submenu_show(struct mjs* mjs) {
view_holder_set_back_callback(submenu->view_holder, submenu_exit, submenu);
view_holder_set_view(submenu->view_holder, submenu_get_view(submenu->submenu));
view_holder_start(submenu->view_holder);
api_lock_wait_unlock(submenu->lock);
view_holder_stop(submenu->view_holder);
view_holder_set_view(submenu->view_holder, NULL);
view_holder_free(submenu->view_holder);
furi_record_close(RECORD_GUI);
api_lock_free(submenu->lock);
applications/system/js_app/modules/js_textbox.c
+4 -5
View File
@@ -125,7 +125,7 @@ static void js_textbox_is_open(struct mjs* mjs) {
static void textbox_callback(void* context, uint32_t arg) {
UNUSED(arg);
JsTextboxInst* textbox = context;
view_holder_stop(textbox->view_holder);
view_holder_set_view(textbox->view_holder, NULL);
textbox->is_shown = false;
}
@@ -145,7 +145,7 @@ static void js_textbox_show(struct mjs* mjs) {
return;
}
view_holder_start(textbox->view_holder);
view_holder_set_view(textbox->view_holder, text_box_get_view(textbox->text_box));
textbox->is_shown = true;
mjs_return(mjs, MJS_UNDEFINED);
@@ -155,7 +155,7 @@ static void js_textbox_close(struct mjs* mjs) {
JsTextboxInst* textbox = get_this_ctx(mjs);
if(!check_arg_count(mjs, 0)) return;
view_holder_stop(textbox->view_holder);
view_holder_set_view(textbox->view_holder, NULL);
textbox->is_shown = false;
mjs_return(mjs, MJS_UNDEFINED);
@@ -180,7 +180,6 @@ static void* js_textbox_create(struct mjs* mjs, mjs_val_t* object) {
textbox->view_holder = view_holder_alloc();
view_holder_attach_to_gui(textbox->view_holder, gui);
view_holder_set_back_callback(textbox->view_holder, textbox_exit, textbox);
view_holder_set_view(textbox->view_holder, text_box_get_view(textbox->text_box));
*object = textbox_obj;
return textbox;
@@ -189,7 +188,7 @@ static void* js_textbox_create(struct mjs* mjs, mjs_val_t* object) {
static void js_textbox_destroy(void* inst) {
JsTextboxInst* textbox = inst;
view_holder_stop(textbox->view_holder);
view_holder_set_view(textbox->view_holder, NULL);
view_holder_free(textbox->view_holder);
textbox->view_holder = NULL;