diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-01-12 22:46:44 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-01-12 22:46:44 +0000 |
| commit | 66e8811c64a833b759511b3f7309e834155a8442 (patch) | |
| tree | 7369237c39f18d29f22bbb46452fcf36ab5a8d15 /grid-view.c | |
| parent | a9644c1f8bf28b7c27edca1d8c85275ae6f89509 (diff) | |
| parent | da72a0b7a8b1f893fd25cfdacef9be7dffa61989 (diff) | |
| download | rtmux-66e8811c64a833b759511b3f7309e834155a8442.tar.gz rtmux-66e8811c64a833b759511b3f7309e834155a8442.tar.bz2 rtmux-66e8811c64a833b759511b3f7309e834155a8442.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
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); |