diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-01-10 21:38:50 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-01-10 21:38:50 +0000 |
| commit | da72a0b7a8b1f893fd25cfdacef9be7dffa61989 (patch) | |
| tree | bffabb2773618cc1f535ea0c8a01a5aa69ade363 /grid-view.c | |
| parent | daea0e4fff77e63ea05392b67d96606c5e7b3ecc (diff) | |
| parent | aae2b7aa89b80ec6b07a8036f923dc6c8882cfae (diff) | |
| download | rtmux-da72a0b7a8b1f893fd25cfdacef9be7dffa61989.tar.gz rtmux-da72a0b7a8b1f893fd25cfdacef9be7dffa61989.tar.bz2 rtmux-da72a0b7a8b1f893fd25cfdacef9be7dffa61989.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'grid-view.c')
| -rw-r--r-- | grid-view.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/grid-view.c b/grid-view.c index 078a0da4..badabd56 100644 --- a/grid-view.c +++ b/grid-view.c @@ -184,10 +184,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx) px = grid_view_x(gd, px); py = grid_view_y(gd, py); - if (gd->linedata[py].cellsize + nx < gd->sx) - sx = grid_view_x(gd, gd->linedata[py].cellsize + nx); - else - sx = grid_view_x(gd, gd->sx); + sx = grid_view_x(gd, gd->sx); if (px == sx - 1) grid_clear(gd, px, py, 1, 1); @@ -204,9 +201,7 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py, u_int nx) px = grid_view_x(gd, px); py = grid_view_y(gd, py); - sx = grid_view_x(gd, gd->linedata[py].cellsize); - if (sx < px + nx) - sx = px + nx; + sx = grid_view_x(gd, gd->sx); grid_move_cells(gd, px, px + nx, py, sx - px - nx); grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1); |