Skip to content

Commit 14b8fcc

Browse files
committed
1 parent fcf1060 commit 14b8fcc

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

packages/project-editor/lvgl/build.ts

+13-4
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,19 @@ export class LVGLBuild extends Build {
467467
`void *flowState = lv_event_get_user_data(e);`
468468
);
469469

470+
build.line("");
471+
472+
if (widget.hasEventHandler) {
473+
widget.buildEventHandler(build);
474+
}
475+
476+
if (
477+
widget.eventHandlers.length > 0 &&
478+
widget.hasEventHandler
479+
) {
480+
build.line("");
481+
}
482+
470483
for (const eventHandler of widget.eventHandlers) {
471484
if (
472485
eventHandler.eventName == "CHECKED" ||
@@ -537,10 +550,6 @@ export class LVGLBuild extends Build {
537550
build.line("}");
538551
}
539552

540-
if (widget.hasEventHandler) {
541-
widget.buildEventHandler(build);
542-
}
543-
544553
build.unindent();
545554
build.line("}");
546555
build.line("");

packages/project-editor/lvgl/widgets/Base.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ export class LVGLWidget extends Widget {
751751
propertyGridGroup: generalGroup,
752752
hideInPropertyGrid: (widget: LVGLWidget) =>
753753
ProjectEditor.getProject(widget).lvglGroups.groups.length ==
754-
0
754+
0 || widget instanceof LVGLScreenWidget
755755
},
756756
{
757757
name: "groupIndex",

packages/project-editor/lvgl/widgets/Screen.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class LVGLScreenWidget extends LVGLWidget {
144144
ProjectEditor.PageClass.classInfo
145145
) as Page;
146146

147-
build.line("if (event == LV_EVENT_SCREEN_LOADED) {");
147+
build.line("if (event == LV_EVENT_SCREEN_LOAD_START) {");
148148
build.indent();
149149

150150
for (const group of allGroups) {

0 commit comments

Comments
 (0)