nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-03 16:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

aa

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@137 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-03 09:17:22 +00:00
parent 23d6e8787e
commit f8e58bb9a9
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core.c
View File

@@ -13,10 +13,13 @@ static void lldrawhandler(MwLL handle, void* data) {
static void lluphandler(MwLL handle, void* data) { static void lluphandler(MwLL handle, void* data) {
MwWidget h = (MwWidget)handle->user; MwWidget h = (MwWidget)handle->user;
MwPoint* p = data;
(void)data; (void)data;
h->pressed = 0; h->pressed = 0;
h->mouse_point.x = p->x;
h->mouse_point.y = p->y;
MwDispatch(h, click); MwDispatch(h, click);
} }

51
src/widget/submenu.c
View File

@@ -53,15 +53,6 @@ static void draw(MwWidget handle) {
p.x = 5 + tw / 2; p.x = 5 + tw / 2;
if(menu->sub[i]->wsub == NULL && arrlen(menu->sub[i]->sub) > 0) {
MwPoint p2 = p;
p2.x += tw / 2 + 5;
p2.y -= 5;
menu->sub[i]->wsub = MwCreateWidget(MwSubMenuClass, "submenu", handle, 0, 0, 0, 0);
MwSubMenuAppear(menu->sub[i]->wsub, menu->sub[i], &p2);
}
p.y += th / 2; p.y += th / 2;
MwDrawText(handle, &p, menu->sub[i]->name, 1, text); MwDrawText(handle, &p, menu->sub[i]->name, 1, text);
p.y += th / 2; p.y += th / 2;
@@ -75,12 +66,46 @@ static void draw(MwWidget handle) {
static void click(MwWidget handle) { static void click(MwWidget handle) {
MwWidget w = handle; MwWidget w = handle;
jmp_buf jmp; jmp_buf jmp;
while(w->parent->widget_class != MwMenuClass) w = w->parent; MwMenu menu = handle->internal;
MwGetBeforeStep(w, &jmp);
MwDestroyWidget(w); if(arrlen(menu->sub) > 0) {
int w = 0, i;
MwRect rc;
longjmp(jmp, 1); rc.x = 5;
rc.y = 5;
for(i = 0; i < arrlen(menu->sub); i++) {
int tw = MwTextWidth(handle, menu->sub[i]->name);
if(tw > w) w = tw;
}
rc.width = w;
for(i = 0; i < arrlen(menu->sub); i++) {
int th = MwTextHeight(handle, menu->sub[i]->name);
rc.height = th;
if(handle->mouse_point.x <= rc.x && handle->mouse_point.y <= rc.y && handle->mouse_point.x <= (int)(rc.x + rc.width) && handle->mouse_point.y <= (int)(rc.y + rc.height)) {
if(menu->sub[i]->wsub == NULL) {
MwPoint p;
p.x = rc.x + rc.width + 5;
p.y = rc.y;
menu->sub[i]->wsub = MwCreateWidget(MwSubMenuClass, "submenu", handle, 0, 0, 0, 0);
MwSubMenuAppear(menu->sub[i]->wsub, menu->sub[i], &p);
}
}
rc.y += rc.height;
}
} else {
while(w->parent->widget_class != MwMenuClass) w = w->parent;
MwGetBeforeStep(w, &jmp);
MwDestroyWidget(w);
longjmp(jmp, 1);
}
} }
MwClassRec MwSubMenuClassRec = { MwClassRec MwSubMenuClassRec = {