diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-12-03 08:41:08 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-12-03 08:41:08 +0000 |
| commit | ccbe2545d9857e03731eddb9757989b9f52dc785 (patch) | |
| tree | ebe4a9fb1310635043e57e0c5586e49f3c2aade9 /grid-view.c | |
| parent | 3e8efcc555a2767ff0abc121cb3232d7e84c3873 (diff) | |
| parent | 54ca7b230d08aae0b2028f3f82a259963017c167 (diff) | |
| download | rtmux-ccbe2545d9857e03731eddb9757989b9f52dc785.tar.gz rtmux-ccbe2545d9857e03731eddb9757989b9f52dc785.tar.bz2 rtmux-ccbe2545d9857e03731eddb9757989b9f52dc785.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'grid-view.c')
| -rw-r--r-- | grid-view.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/grid-view.c b/grid-view.c index a34c5a08..078a0da4 100644 --- a/grid-view.c +++ b/grid-view.c @@ -184,9 +184,10 @@ 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); - sx = grid_view_x(gd, gd->linedata[py].cellsize); - if (sx < px + nx) - sx = px + nx; + 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); if (px == sx - 1) grid_clear(gd, px, py, 1, 1); |