nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2025-12-30 22:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

submenu

Browse Source
This commit is contained in:
NishiOwO
2025-12-21 12:08:08 +09:00
parent ab9d0ffc5f
commit f09960195f
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/Mw/Widget/SubMenu.h
View File

@@ -18,8 +18,15 @@ extern "C" {
*/
MWDECL MwClass MwSubMenuClass;
MwInline void MwSubMenuAppear(MwWidget handle, MwMenu menu, MwPoint* point) {
MwVaWidgetExecute(handle, "mwSubMenuAppear", NULL, menu, point);
/*!
* @brief Makes submenu appear
* @param handle Handle
* @param menu Menu
* @param point Point
* @param diff_calc Toggles different way to calculate positiion
*/
MwInline void MwSubMenuAppear(MwWidget handle, MwMenu menu, MwPoint* point, int diff_calc) {
MwVaWidgetExecute(handle, "mwSubMenuAppear", NULL, menu, point, diff_calc);
}
#ifdef __cplusplus

2
src/widget/menu.c
View File

@@ -129,7 +129,7 @@ static void mouse_down(MwWidget handle, void* ptr) {
p2.y = p.y + th / 2 + 5;
m->sub[i]->wsub = MwCreateWidget(MwSubMenuClass, "submenu", handle, 0, 0, 0, 0);
MwSubMenuAppear(m->sub[i]->wsub, m->sub[i], &p2);
MwSubMenuAppear(m->sub[i]->wsub, m->sub[i], &p2, 0);
} else if(m->sub[i]->wsub != NULL && m->sub[i]->keep) {
MwDestroyWidget(m->sub[i]->wsub);
m->sub[i]->wsub = NULL;

15
src/widget/submenu.c
View File

@@ -130,7 +130,7 @@ static void click(MwWidget handle) {
p.y = rc.y - 3;
menu->sub[i]->wsub = MwCreateWidget(MwSubMenuClass, "submenu", handle, 0, 0, 0, 0);
MwSubMenuAppear(menu->sub[i]->wsub, menu->sub[i], &p);
MwSubMenuAppear(menu->sub[i]->wsub, menu->sub[i], &p, 0);
i = -1;
} else if(menu->sub[i]->wsub != NULL && arrlen(menu->sub[i]->sub) > 0) {
while(w->parent->widget_class != MwMenuClass) w = w->parent;
@@ -159,7 +159,7 @@ static void click(MwWidget handle) {
}
}
static void mwSubMenuAppearImpl(MwWidget handle, MwMenu menu, MwPoint* point) {
static void mwSubMenuAppearImpl(MwWidget handle, MwMenu menu, MwPoint* point, int diff_calc) {
int i, w = 0, h = 0;
MwRect rc;
MwPoint p = *point;
@@ -183,6 +183,10 @@ static void mwSubMenuAppearImpl(MwWidget handle, MwMenu menu, MwPoint* point) {
w += 10 + 15;
h += 3;
if(diff_calc) {
p.y = rc.height - p.y - h;
}
MwLLMakeToolWindow(handle->lowlevel);
MwLLDetach(handle->lowlevel, &p);
@@ -203,9 +207,10 @@ static void func_handler(MwWidget handle, const char* name, void* out, va_list v
(void)out;
if(strcmp(name, "mwSubMenuAppear") == 0) {
MwMenu menu = va_arg(va, MwMenu);
MwPoint* point = va_arg(va, MwPoint*);
mwSubMenuAppearImpl(handle, menu, point);
MwMenu menu = va_arg(va, MwMenu);
MwPoint* point = va_arg(va, MwPoint*);
int diff_calc = va_arg(va, int);
mwSubMenuAppearImpl(handle, menu, point, diff_calc);
}
}