blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

ncmenu: fix horizontal bounds for mouse clicks #2582

Browse Source
This commit is contained in:
nick black 2022-02-07 09:33:22 -05:00
parent 6bd7f755f6
commit ab5ba75535
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/menu.c
View File

@ -659,17 +659,19 @@ const char* ncmenu_mouse_selected(const ncmenu* n, const ncinput* click,
if(!ncplane_translate_abs(nc, &y, &x)){
return NULL;
}
// FIXME section_x() works only off the section header lengths, meaning that
// if we click an item outside of those columns covered by the header, it will
// read as a -1 from section_x(). we want to instead get the unrolled section,
// find its boundaries, and verify that we are within them.
int i = section_x(n, x);
if(i < 0 || i != n->unrolledsection){
if(n->unrolledsection < 0){
return NULL;
}
const struct ncmenu_int_section* sec = &n->sections[n->unrolledsection];
if(y < 2 || (unsigned)y - 2 >= sec->itemcount){
return NULL;
// don't allow a click on the side boundaries
if(sec->xoff < 0){
if((unsigned)x > dimx - 4 || (unsigned)x <= dimx - 4 - sec->bodycols){
return NULL;
}
}else{
if(x <= sec->xoff || x > sec->xoff + sec->bodycols){
return NULL;
}
}
const int itemidx = y - 2;
if(sec->items[itemidx].disabled){