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

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

Browse source
This commit is contained in:
IoIxD 2026-09-28 18:46:12 -07:00
commit b59ddffce6
4 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/Mw/TypeDefs.h
View file

@ -169,6 +169,7 @@ struct _MwMenu {
MwMenu* sub; MwMenu* sub;
void* opaque; void* opaque;
int cleaned; int cleaned;
int bold;
}; };
struct _MwEntry { struct _MwEntry {

9
src/backend/wayland/wayland.c
View file

@ -628,6 +628,8 @@ static void setup_popup(MwLL r, int x, int y, MwLL parent) {
xdg_positioner_set_anchor(r->wayland.popup->xdg_positioner, XDG_POSITIONER_ANCHOR_NONE); xdg_positioner_set_anchor(r->wayland.popup->xdg_positioner, XDG_POSITIONER_ANCHOR_NONE);
xdg_positioner_set_gravity(r->wayland.popup->xdg_positioner, XDG_POSITIONER_GRAVITY_NONE); xdg_positioner_set_gravity(r->wayland.popup->xdg_positioner, XDG_POSITIONER_GRAVITY_NONE);
/* we can't see where we are on screen, so let the compositor keep the popup on it */
xdg_positioner_set_constraint_adjustment(r->wayland.popup->xdg_positioner, XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y);
r->wayland.xkb_keymap = topmost_parent->wayland.xkb_keymap; r->wayland.xkb_keymap = topmost_parent->wayland.xkb_keymap;
r->wayland.xkb_state = topmost_parent->wayland.xkb_state; r->wayland.xkb_state = topmost_parent->wayland.xkb_state;
@ -1776,7 +1778,12 @@ static void MwLLDetachImpl(MwLL handle, MwPoint* point) {
while(p != NULL) { while(p != NULL) {
/* a layer surface's x/y is its position on screen, which like a toplevel's isn't part of the offset */ /* a layer surface's x/y is its position on screen, which like a toplevel's isn't part of the offset */
if(p->wayland.type != MwLL_WAYLAND_TOPLEVEL && p->wayland.type != MwLL_WAYLAND_LAYER_SURFACE) { if(p->wayland.type == MwLL_WAYLAND_POPUP) {
/* a popup's x/y is already relative to the topmost surface, so anything above it is counted already */
x += p->wayland.x;
y += p->wayland.y;
break;
} else if(p->wayland.type != MwLL_WAYLAND_TOPLEVEL && p->wayland.type != MwLL_WAYLAND_LAYER_SURFACE) {
x += p->wayland.x; x += p->wayland.x;
y += p->wayland.y; y += p->wayland.y;
} else { } else {

1
src/widget/menu.c
View file

@ -248,6 +248,7 @@ static MwMenu mwMenuAddImpl(MwWidget handle, MwMenu menu, const char* name) {
new->wsub = NULL; new->wsub = NULL;
new->keep = 0; new->keep = 0;
new->cleaned = 0; new->cleaned = 0;
new->bold = 0;
arrput(m->sub, new); arrput(m->sub, new);

14
src/widget/submenu.c
View file

@ -57,8 +57,9 @@ static void draw(MwWidget handle) {
p.y += 2 + 1; p.y += 2 + 1;
} else { } else {
int tw = MwTextWidth(handle, NULL, menu->sub[i]->name); MwFLFont font = MwFLBuildFont(menu->sub[i]->wsub != NULL ? MwFLFlagBold : 0);
int th = MwTextHeight(handle, NULL, menu->sub[i]->name); int tw = MwTextWidth(handle, font, menu->sub[i]->name);
int th = MwTextHeight(handle, NULL, menu->sub[i]->name);
if(menu->sub[i]->wsub != NULL) { if(menu->sub[i]->wsub != NULL) {
r.x = MwGetInteger(handle, MwNleftPadding); r.x = MwGetInteger(handle, MwNleftPadding);
@ -71,7 +72,7 @@ static void draw(MwWidget handle) {
p.x = 5 + tw / 2 + MwGetInteger(handle, MwNleftPadding); p.x = 5 + tw / 2 + MwGetInteger(handle, MwNleftPadding);
p.y += th / 2; p.y += th / 2;
MwDrawText(handle, MwFLBuildFont(menu->sub[i]->wsub != NULL ? MwFLFlagBold : 0), &p, menu->sub[i]->name, MwALIGNMENT_CENTER, text); MwDrawText(handle, font, &p, menu->sub[i]->name, MwALIGNMENT_CENTER, text);
if(arrlen(menu->sub[i]->sub) > 0) { if(arrlen(menu->sub[i]->sub) > 0) {
MwRect tr; MwRect tr;
@ -182,6 +183,11 @@ static void mwSubMenuAppearImpl(MwWidget handle, MwMenu menu, MwPoint* point, in
MwLLMakeToolWindow(handle->lowlevel); MwLLMakeToolWindow(handle->lowlevel);
MwLLDetach(handle->lowlevel, &p); MwLLDetach(handle->lowlevel, &p);
MwVaApply(handle,
MwNwidth, sz.width,
MwNheight, sz.height,
NULL);
if(handle->lowlevel->common.coordinate_type == MwCOORDINATE_GLOBAL) { if(handle->lowlevel->common.coordinate_type == MwCOORDINATE_GLOBAL) {
if(MwGetInteger(handle, MwNy) + sz.height > rc.height) { if(MwGetInteger(handle, MwNy) + sz.height > rc.height) {
MwVaApply(handle, MwVaApply(handle,
@ -208,7 +214,7 @@ static void mwSubMenuGetSizeImpl(MwWidget handle, MwMenu menu, MwRect* rect) {
if(strcmp(menu->sub[i]->name, "----") == 0) { if(strcmp(menu->sub[i]->name, "----") == 0) {
rect->height += 2 + 2; rect->height += 2 + 2;
} else { } else {
int tw = MwTextWidth(handle, NULL, menu->sub[i]->name); int tw = MwTextWidth(handle, MwFLBuildFont(arrlen(menu->sub[i]->sub) > 0 ? MwFLFlagBold : 0), menu->sub[i]->name);
rect->height += MwTextHeight(handle, NULL, menu->sub[i]->name) + 3; rect->height += MwTextHeight(handle, NULL, menu->sub[i]->name) + 3;
if(tw > rect->width) { if(tw > rect->width) {
rect->width = tw; rect->width = tw;