o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More prep.

Browse source
This commit is contained in:
rsc 2005-10-31 18:45:06 +00:00
parent 33dc4226a8
commit d5233ccb3a
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/acme/cols.c
View file

@ -269,7 +269,7 @@ colsort(Column *c)
r1.max.y = r1.min.y+Border; r1.max.y = r1.min.y+Border;
draw(screen, r1, display->black, nil, ZP); draw(screen, r1, display->black, nil, ZP);
r.min.y = r1.max.y; r.min.y = r1.max.y;
y = winresize(w, r, FALSE, TRUE); y = winresize(w, r, FALSE, i==c->nw-1);
} }
free(rp); free(rp);
free(c->w); free(c->w);
@ -386,7 +386,7 @@ colgrow(Column *c, Window *w, int but)
r.max.y = y2; r.max.y = y2;
h = w->body.fr.font->height; h = w->body.fr.font->height;
if(Dy(r) < Dy(w->tagtop)+1+h+Border) if(Dy(r) < Dy(w->tagtop)+1+h+Border)
r.max.y = r.min.y+Dy(w->tagtop)+1+h+Border; r.max.y = r.min.y + Dy(w->tagtop)+1+h+Border;
/* draw window */ /* draw window */
winresize(w, r, c->safe, TRUE); winresize(w, r, c->safe, TRUE);
if(i < c->nw-1){ if(i < c->nw-1){
@ -402,7 +402,7 @@ colgrow(Column *c, Window *w, int but)
v = c->w[j]; v = c->w[j];
r = v->r; r = v->r;
r.min.y = y1; r.min.y = y1;
r.max.y = y1+Dy(v->tag.all); r.max.y = y1+Dy(v->tagtop);
if(nl[j]) if(nl[j])
r.max.y += 1 + nl[j]*v->body.fr.font->height; r.max.y += 1 + nl[j]*v->body.fr.font->height;
y1 = winresize(v, r, c->safe, j+1==c->nw); y1 = winresize(v, r, c->safe, j+1==c->nw);

11
src/cmd/acme/wind.c
View file

@ -32,10 +32,10 @@ wininit(Window *w, Window *clone, Rectangle r)
w->ctlfid = ~0; w->ctlfid = ~0;
w->utflastqid = -1; w->utflastqid = -1;
r1 = r; r1 = r;
w->tagtop = r; w->tagtop = r;
w->tagtop.max.y = r.min.y + font->height; w->tagtop.max.y = r.min.y + font->height;
r1.max.y = r1.min.y + w->taglines*font->height; r1.max.y = r1.min.y + w->taglines*font->height;
incref(&reffont.ref); incref(&reffont.ref);
f = fileaddtext(nil, &w->tag); f = fileaddtext(nil, &w->tag);
@ -127,8 +127,9 @@ winresize(Window *w, Rectangle r, int safe, int keepextra)
r1 = r; r1 = r;
r1.max.y = min(r.max.y, r1.min.y + w->taglines*font->height); r1.max.y = min(r.max.y, r1.min.y + w->taglines*font->height);
y = r1.max.y; y = r1.max.y;
if(1 || !safe || !eqrect(w->tag.fr.r, r1)){ if(1 || !safe || !eqrect(w->tag.all, r1)){
y = textresize(&w->tag, r1, TRUE); textresize(&w->tag, r1, TRUE);
y = w->tag.fr.r.max.y;
b = button; b = button;
if(w->body.file->mod && !w->isdir && !w->isscratch) if(w->body.file->mod && !w->isdir && !w->isscratch)
b = modbutton; b = modbutton;
@ -140,7 +141,7 @@ winresize(Window *w, Rectangle r, int safe, int keepextra)
r1 = r; r1 = r;
r1.min.y = y; r1.min.y = y;
if(1 || !safe || !eqrect(w->body.fr.r, r1)){ if(!safe || !eqrect(w->body.all, r1)){
if(y+1+w->body.fr.font->height <= r.max.y){ /* room for one line */ if(y+1+w->body.fr.font->height <= r.max.y){ /* room for one line */
r1.min.y = y; r1.min.y = y;
r1.max.y = y+1; r1.max.y = y+1;