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

Final merge fixes

Browse Source
This commit is contained in:
Willy-JL
2024-08-14 02:01:04 +02:00
parent 1a1b3f117a
commit 574304f715
12 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
applications/system/js_app/modules/js_widget.c
View File

@@ -825,7 +825,7 @@ static void js_widget_is_open(struct mjs* mjs) {
static void widget_callback(void* context, uint32_t arg) {
UNUSED(arg);
JsWidgetInst* widget = context;
view_holder_stop(widget->view_holder);
view_holder_set_view(widget->view_holder, NULL);
widget->is_shown = false;
}
@@ -845,7 +845,7 @@ static void js_widget_show(struct mjs* mjs) {
return;
}
view_holder_start(widget->view_holder);
view_holder_set_view(widget->view_holder, widget->view);
widget->is_shown = true;
mjs_return(mjs, MJS_UNDEFINED);
@@ -855,7 +855,7 @@ static void js_widget_close(struct mjs* mjs) {
JsWidgetInst* widget = get_this_ctx(mjs);
if(!check_arg_count(mjs, 0)) return;
view_holder_stop(widget->view_holder);
view_holder_set_view(widget->view_holder, NULL);
widget->is_shown = false;
mjs_return(mjs, MJS_UNDEFINED);
@@ -933,7 +933,6 @@ static void* js_widget_create(struct mjs* mjs, mjs_val_t* object) {
widget->view_holder = view_holder_alloc();
view_holder_attach_to_gui(widget->view_holder, gui);
view_holder_set_back_callback(widget->view_holder, widget_exit, widget);
view_holder_set_view(widget->view_holder, widget->view);
*object = widget_obj;
return widget;
@@ -942,7 +941,7 @@ static void* js_widget_create(struct mjs* mjs, mjs_val_t* object) {
static void js_widget_destroy(void* inst) {
JsWidgetInst* widget = inst;
view_holder_stop(widget->view_holder);
view_holder_set_view(widget->view_holder, NULL);
view_holder_free(widget->view_holder);
widget->view_holder = NULL;