pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 6 Pull requests 1 Projects Releases 7 Packages Wiki Activity Actions

improve callback
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Nishi 2026-09-21 11:47:44 +09:00
commit 39dd112f2b
5 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/basic/document.c
View file

@ -22,11 +22,12 @@ static void MWAPI resize_window(MwWidget handle, void* user, void* call) {
} }
static void MWAPI layout_document(MwWidget handle, void* user, void* call) { static void MWAPI layout_document(MwWidget handle, void* user, void* call) {
int height = *(int*)call; MwRect size = *(MwRect*)call;
MwViewportSetSize(viewport, MwGetInteger(document, MwNwidth), height); MwViewportSetSize(viewport, size.width, size.height);
MwVaApply(document, MwVaApply(document,
MwNheight, height, MwNwidth, size.width,
MwNheight, size.height,
NULL); NULL);
} }

28
milsko.xml
View file

@ -105,15 +105,13 @@
<integer name="waitLayout" /> <integer name="waitLayout" />
<integer name="scale" /> <integer name="scale" />
<integer name="columns" /> <integer name="columns" />
<integer name="commonSpan" common="yes" /> <integer name="columnSpan" column="yes" />
<integer name="rowSpan" common="yes" /> <integer name="rowSpan" column="yes" />
<integer name="acceptsDnD" common="yes" /> <integer name="acceptsDnD" column="yes" />
<integer name="hour" /> <integer name="hour" />
<integer name="minute" /> <integer name="minute" />
<integer name="second" /> <integer name="second" />
<integer name="type" /> <integer name="type" />
<integer name="strikethrough" common="yes" />
<integer name="underline" common="yes" />
<!-- waitMS is a special property, only applies to toplevel widget --> <!-- waitMS is a special property, only applies to toplevel widget -->
<integer name="waitMS" common="yes" /> <integer name="waitMS" common="yes" />
@ -206,7 +204,7 @@
<string /> <string />
</handler> </handler>
<handler name="layout"> <handler name="layout">
<integer pointer="yes" /> <struct defname="MwRect" pointer="yes" />
</handler> </handler>
</handlers> </handlers>
<enumerations> <enumerations>
@ -1072,10 +1070,20 @@
<return> <return>
<pointer /> <pointer />
</return> </return>
<arguments> </function>
<integer enumname="MwVulkanField" name="field" /> </functions>
<integer pointer="yes" name="output" /> </widget>
</arguments> <widget name="Direct3D9">
<functions>
<function name="GetDirect3D9">
<return>
<pointer />
</return>
</function>
<function name="GetDirect3DDevice9">
<return>
<pointer />
</return>
</function> </function>
</functions> </functions>
</widget> </widget>

6
src/widget/document.c
View file

@ -498,6 +498,7 @@ static void layout(MwWidget handle) {
MwFLFont* fontstack = NULL; MwFLFont* fontstack = NULL;
MwRect clickable; MwRect clickable;
char* c_title = NULL; char* c_title = NULL;
MwRect size;
arrput(fontstack, NULL); arrput(fontstack, NULL);
@ -612,8 +613,9 @@ static void layout(MwWidget handle) {
l->font = TOPFONT; l->font = TOPFONT;
} }
y += MwTextHeight(handle, TOPFONT, "M"); size.width = w;
MwDispatchUserHandler(handle, MwNlayoutHandler, &y); size.height = y + MwTextHeight(handle, TOPFONT, "M");
MwDispatchUserHandler(handle, MwNlayoutHandler, &size);
arrfree(fontstack); arrfree(fontstack);