blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

multiselector: trans out appropriately #627

Browse Source
This commit is contained in:
nick black 2020-09-13 12:27:02 -04:00 committed by Nick Black
parent 4f04f1bc31
commit 48ca4286d7
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/selector.c
View File

@ -546,6 +546,9 @@ ncmultiselector_body_width(const ncmultiselector* n){
static int static int
ncmultiselector_draw(ncmultiselector* n){ ncmultiselector_draw(ncmultiselector* n){
ncplane_erase(n->ncp); ncplane_erase(n->ncp);
cell transchar = CELL_TRIVIAL_INITIALIZER;
cell_set_fg_alpha(&transchar, CELL_ALPHA_TRANSPARENT);
cell_set_bg_alpha(&transchar, CELL_ALPHA_TRANSPARENT);
// if we have a title, we'll draw a riser. the riser is two rows tall, and // if we have a title, we'll draw a riser. the riser is two rows tall, and
// exactly four columns longer than the title, and aligned to the right. we // exactly four columns longer than the title, and aligned to the right. we
// draw a rounded box. the body will blow part or all of the bottom away. // draw a rounded box. the body will blow part or all of the bottom away.
@ -553,17 +556,26 @@ ncmultiselector_draw(ncmultiselector* n){
if(n->title){ if(n->title){
size_t riserwidth = n->titlecols + 4; size_t riserwidth = n->titlecols + 4;
int offx = ncplane_align(n->ncp, NCALIGN_RIGHT, riserwidth); int offx = ncplane_align(n->ncp, NCALIGN_RIGHT, riserwidth);
ncplane_cursor_move_yx(n->ncp, 0, offx); ncplane_cursor_move_yx(n->ncp, 0, 0);
ncplane_hline(n->ncp, &transchar, offx);
ncplane_rounded_box_sized(n->ncp, 0, n->boxchannels, 3, riserwidth, 0); ncplane_rounded_box_sized(n->ncp, 0, n->boxchannels, 3, riserwidth, 0);
n->ncp->channels = n->titlechannels; n->ncp->channels = n->titlechannels;
ncplane_printf_yx(n->ncp, 1, offx + 1, " %s ", n->title); ncplane_printf_yx(n->ncp, 1, offx + 1, " %s ", n->title);
yoff += 2; yoff += 2;
ncplane_cursor_move_yx(n->ncp, 1, 0);
ncplane_hline(n->ncp, &transchar, offx);
} }
int bodywidth = ncmultiselector_body_width(n); int bodywidth = ncmultiselector_body_width(n);
int xoff = ncplane_align(n->ncp, NCALIGN_RIGHT, bodywidth);
ncplane_cursor_move_yx(n->ncp, yoff, xoff);
int dimy, dimx; int dimy, dimx;
ncplane_dim_yx(n->ncp, &dimy, &dimx); ncplane_dim_yx(n->ncp, &dimy, &dimx);
int xoff = ncplane_align(n->ncp, NCALIGN_RIGHT, bodywidth);
if(xoff){
for(int y = yoff + 1 ; y < dimy ; ++y){
ncplane_cursor_move_yx(n->ncp, y, 0);
ncplane_hline(n->ncp, &transchar, xoff);
}
}
ncplane_cursor_move_yx(n->ncp, yoff, xoff);
ncplane_rounded_box_sized(n->ncp, 0, n->boxchannels, dimy - yoff, bodywidth, 0); ncplane_rounded_box_sized(n->ncp, 0, n->boxchannels, dimy - yoff, bodywidth, 0);
if(n->title){ if(n->title){
n->ncp->channels = n->boxchannels; n->ncp->channels = n->boxchannels;
@ -595,9 +607,9 @@ ncmultiselector_draw(ncmultiselector* n){
} }
// Top line of body (background and possibly up arrow) // Top line of body (background and possibly up arrow)
++yoff; ++yoff;
cell transc = CELL_TRIVIAL_INITIALIZER; // fall back to base cell
ncplane_cursor_move_yx(n->ncp, yoff, xoff + 1); ncplane_cursor_move_yx(n->ncp, yoff, xoff + 1);
for(int i = xoff + 1 ; i < dimx - 1 ; ++i){ for(int i = xoff + 1 ; i < dimx - 1 ; ++i){
cell transc = CELL_TRIVIAL_INITIALIZER; // fall back to base cell
ncplane_putc(n->ncp, &transc); ncplane_putc(n->ncp, &transc);
} }
const int bodyoffset = dimx - bodywidth + 2; const int bodyoffset = dimx - bodywidth + 2;
@ -618,6 +630,7 @@ ncmultiselector_draw(ncmultiselector* n){
} }
ncplane_cursor_move_yx(n->ncp, yoff, xoff + 1); ncplane_cursor_move_yx(n->ncp, yoff, xoff + 1);
for(int i = xoff + 1 ; i < dimx - 1 ; ++i){ for(int i = xoff + 1 ; i < dimx - 1 ; ++i){
cell transc = CELL_TRIVIAL_INITIALIZER; // fall back to base cell
ncplane_putc(n->ncp, &transc); ncplane_putc(n->ncp, &transc);
} }
n->ncp->channels = n->descchannels; n->ncp->channels = n->descchannels;
@ -647,6 +660,7 @@ ncmultiselector_draw(ncmultiselector* n){
// Bottom line of body (background and possibly down arrow) // Bottom line of body (background and possibly down arrow)
ncplane_cursor_move_yx(n->ncp, yoff, xoff + 1); ncplane_cursor_move_yx(n->ncp, yoff, xoff + 1);
for(int i = xoff + 1 ; i < dimx - 1 ; ++i){ for(int i = xoff + 1 ; i < dimx - 1 ; ++i){
cell transc = CELL_TRIVIAL_INITIALIZER; // fall back to base cell
ncplane_putc(n->ncp, &transc); ncplane_putc(n->ncp, &transc);
} }
if(n->maxdisplay && n->maxdisplay < n->itemcount){ if(n->maxdisplay && n->maxdisplay < n->itemcount){