commit - a06877afa9b778570f599e0e8fa83347426fa0b9
commit + a208917e7a935c019095acd1acd8165f08a54b7a
blob - 21efdc2df7658b7db01d01f3452c964a5ad0722c
blob + 544ba99d9f7c103bbff078ad76497eb2323ba494
--- CONTRIBUTORS
+++ CONTRIBUTORS
Michael Teichgräber <mt4swm@googlemail.com>
Michael Teichgräber <mt@ib.wmipf.de>
Nikolai Saoukh <nikolai.saoukh@gmail.com>
+Rob Pike <robpike@gmail.com>
Russ Cox <rsc@swtch.com>
Tim Newsham <tim.newsham@gmail.com>
Tony Lainson <t.lainson@gmail.com>
Venkatesh Srinivas <extrudedaluminiu@gmail.com>
-grai <t.lainson@gmail.com>
+
blob - 36e244b4d1b90cceab99bbeb5e7df330f37bf5eb
blob + c57a41b020bc45d34b115dbd33b27b514da1b00e
--- src/cmd/acme/rows.c
+++ src/cmd/acme/rows.c
void
rowresize(Row *row, Rectangle r)
{
- int i, dx, odx;
- Rectangle r1, r2;
+ int i, dx, odx, deltax;
+ Rectangle or, r1, r2;
Column *c;
dx = Dx(r);
odx = Dx(row->r);
+ or = row->r;
+ deltax = r.min.x - or.min.x;
row->r = r;
r1 = r;
r1.max.y = r1.min.y + font->height;
for(i=0; i<row->ncol; i++){
c = row->col[i];
r1.min.x = r1.max.x;
+ /* the test should not be necessary, but guarantee we don't lose a pixel */
if(i == row->ncol-1)
r1.max.x = r.max.x;
else
- r1.max.x = r1.min.x+Dx(c->r)*dx/odx;
+ r1.max.x = (c->r.max.x-or.min.x)*Dx(r)/Dx(or) + deltax;
if(i > 0){
r2 = r1;
r2.max.x = r2.min.x+Border;