diff --git a/resources/eez-framework-amalgamation/eez-flow.cpp b/resources/eez-framework-amalgamation/eez-flow.cpp index 4d7bde735..e3cb1f12e 100644 --- a/resources/eez-framework-amalgamation/eez-flow.cpp +++ b/resources/eez-framework-amalgamation/eez-flow.cpp @@ -1,9 +1,9 @@ -/* Autogenerated on December 17, 2024 7:08:39 PM from eez-framework commit 5ca49b64d830b3cd1abdc4270f2b9cbc48d7a9f3 */ +/* Autogenerated on January 24, 2025 9:01:25 PM from eez-framework commit 3e77217de3bfe5f3bee72e7c438adff9f71b8401 */ /* * eez-framework * * MIT License - * Copyright 2024 Envox d.o.o. + * Copyright 2025 Envox d.o.o. * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -3958,7 +3958,11 @@ void executeLVGLComponent(FlowState *flowState, unsigned componentIndex) { } else if (specific->property == BASIC_OPACITY) { lv_obj_set_style_opa(target, intValue, 0); } else if (specific->property == DROPDOWN_SELECTED) { + #if LVGL_VERSION_MAJOR >= 9 && LVGL_VERSION_MINOR >= 3 + lv_dropdown_set_selected(target, intValue, LV_ANIM_OFF); +#else lv_dropdown_set_selected(target, intValue); +#endif } else if (specific->property == IMAGE_ANGLE) { lv_img_set_angle(target, intValue); } else if (specific->property == IMAGE_ZOOM) { @@ -4422,7 +4426,11 @@ ACTION_START(dropdownSetSelected) WIDGET_PROP(obj); UINT32_PROP(value); #if LVGL_VERSION_MAJOR >= 9 +#if LVGL_VERSION_MINOR >= 3 + lv_dropdown_set_selected(obj, value, LV_ANIM_OFF); +#else lv_dropdown_set_selected(obj, value); +#endif #else lv_dropdown_set_selected(obj, (uint16_t)value); #endif @@ -10404,7 +10412,6 @@ void assignValue(FlowState *flowState, int componentIndex, Value &dstValue, cons return; } pDstValue = &array->values[arrayElementValue->elementIndex]; - dstValueType = arrayElementValue->dstValueType; } } #if defined(EEZ_DASHBOARD_API) diff --git a/resources/eez-framework-amalgamation/eez-flow.h b/resources/eez-framework-amalgamation/eez-flow.h index 96181ce18..daf616a1f 100644 --- a/resources/eez-framework-amalgamation/eez-flow.h +++ b/resources/eez-framework-amalgamation/eez-flow.h @@ -1,9 +1,9 @@ -/* Autogenerated on December 17, 2024 7:08:39 PM from eez-framework commit 5ca49b64d830b3cd1abdc4270f2b9cbc48d7a9f3 */ +/* Autogenerated on January 24, 2025 9:01:25 PM from eez-framework commit 3e77217de3bfe5f3bee72e7c438adff9f71b8401 */ /* * eez-framework * * MIT License - * Copyright 2024 Envox d.o.o. + * Copyright 2025 Envox d.o.o. * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/wasm/eez-framework b/wasm/eez-framework index 3e77217de..0006a5c34 160000 --- a/wasm/eez-framework +++ b/wasm/eez-framework @@ -1 +1 @@ -Subproject commit 3e77217de3bfe5f3bee72e7c438adff9f71b8401 +Subproject commit 0006a5c3421e344c1cceb13528634cd9dd62adac