Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-20 03:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[plane] incorporate left/top margins into resize #1472

Browse Source
This commit is contained in:
nick black 2021-03-27 08:12:18 -04:00
parent 5a6ee2d720
commit fac56fc2cc
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/notcurses.c
View File

@ -1186,11 +1186,7 @@ int notcurses_stop(notcurses* nc){
// if we were not using the alternate screen, our cursor's wherever we last // if we were not using the alternate screen, our cursor's wherever we last
// wrote. move it to the bottom left of the screen. // wrote. move it to the bottom left of the screen.
if(!nc->tcache.smcup){ if(!nc->tcache.smcup){
// FIXME combine into a single cup (heh)? tty_emit(tiparm(nc->tcache.cup, nc->lfdimy + nc->margin_t - 1, 0), nc->ttyfd);
tty_emit(tiparm(nc->tcache.hpa, 0), nc->ttyfd);
if(nc->lfdimy){
tty_emit(tiparm(nc->tcache.vpa, nc->lfdimy + nc->margin_t - 1), nc->ttyfd);
}
} }
if(nc->ttyfd >= 0){ if(nc->ttyfd >= 0){
ret |= close(nc->ttyfd); ret |= close(nc->ttyfd);
@ -2187,17 +2183,18 @@ int ncplane_resize_marginalized(ncplane* n){
// a marginalized plane cannot be larger than its oppressor plane =] // a marginalized plane cannot be larger than its oppressor plane =]
int maxy, maxx; int maxy, maxx;
if(parent == n){ // root plane, need to use pile size if(parent == n){ // root plane, need to use pile size
return 0; // FIXME ncpile* p = ncplane_pile(n);
maxy = p->dimy;
maxx = p->dimx;
}else{ }else{
ncplane_dim_yx(parent, &maxy, &maxx); ncplane_dim_yx(parent, &maxy, &maxx);
} }
if((maxy -= n->margin_b) < 1){ if((maxy -= (n->margin_b + (n->absy - n->boundto->absy))) < 1){
maxy = 1; maxy = 1;
} }
if((maxx -= n->margin_r) < 1){ if((maxx -= (n->margin_r + (n->absx - n->boundto->absx))) < 1){
maxx = 1; maxx = 1;
} }
// FIXME mix in top/left margins (absy/absx)
int oldy, oldx; int oldy, oldx;
ncplane_dim_yx(n, &oldy, &oldx); // current dimensions of 'n' ncplane_dim_yx(n, &oldy, &oldx); // current dimensions of 'n'
int keepleny = oldy > maxy ? maxy : oldy; int keepleny = oldy > maxy ? maxy : oldy;