Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ncmultiselector: draw properly

Browse Source
This commit is contained in:
nick black 2020-03-09 01:52:55 -04:00 committed by Nick Black
parent a9c64a8c8b
commit 667ac14549
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/selector.c
View File

@ -470,7 +470,7 @@ ncmultiselector_draw(ncmultiselector* n){
const int bodyoffset = dimx - bodywidth + 2;
if(n->maxdisplay && n->maxdisplay < n->itemcount){
n->ncp->channels = n->descchannels;
n->arrowx = bodyoffset + n->longop;
n->arrowx = bodyoffset + 3;
ncplane_putegc_yx(n->ncp, yoff, n->arrowx, "↑", NULL);
}else{
n->arrowx = -1;
@ -478,6 +478,7 @@ ncmultiselector_draw(ncmultiselector* n){
n->uarrowy = yoff;
unsigned printidx = n->startdisp;
unsigned printed = 0;
// visible option lines
for(yoff += 1 ; yoff < dimy - 2 ; ++yoff){
if(n->maxdisplay && printed == n->maxdisplay){
break;
@ -486,16 +487,21 @@ ncmultiselector_draw(ncmultiselector* n){
for(int i = xoff + 1 ; i < dimx - 1 ; ++i){
ncplane_putc(n->ncp, &n->background);
}
n->ncp->channels = n->opchannels;
if(printidx == n->current){
n->ncp->channels = (uint64_t)channels_bchannel(n->opchannels) << 32u | channels_fchannel(n->opchannels);
}
ncplane_printf_yx(n->ncp, yoff, bodyoffset + (n->longop - n->items[printidx].opcolumns), "%s", n->items[printidx].option);
n->ncp->channels = n->descchannels;
if(printidx == n->current){
n->ncp->channels = (uint64_t)channels_bchannel(n->descchannels) << 32u | channels_fchannel(n->descchannels);
}
ncplane_printf_yx(n->ncp, yoff, bodyoffset + n->longop, " %s", n->items[printidx].desc);
ncplane_putegc_yx(n->ncp, yoff, bodyoffset, "☐", NULL);
n->ncp->channels = n->opchannels;
if(printidx == n->current){
n->ncp->channels = (uint64_t)channels_bchannel(n->opchannels) << 32u | channels_fchannel(n->opchannels);
}
ncplane_printf(n->ncp, " %s ", n->items[printidx].option);
n->ncp->channels = n->descchannels;
if(printidx == n->current){
n->ncp->channels = (uint64_t)channels_bchannel(n->descchannels) << 32u | channels_fchannel(n->descchannels);
}
ncplane_printf(n->ncp, "%s", n->items[printidx].desc);
if(++printidx == n->itemcount){
printidx = 0;
}

2
src/poc/multiselect.c
View File

@ -60,7 +60,7 @@ int main(void){
}
multiselector_options sopts;
memset(&sopts, 0, sizeof(sopts));
sopts.maxdisplay = 4;
sopts.maxdisplay = 10;
sopts.items = items;
sopts.itemcount = sizeof(items) / sizeof(*items);
sopts.title = "this is truly, absolutely an awfully long example of a selector title";