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

acme: tag resize nits

Browse source
This commit is contained in:
Russ Cox 2008-03-07 07:48:08 -05:00
parent 0cd1385d9f
commit fdddf6f018
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,10 +134,11 @@ wintaglines(Window *w, Rectangle r)
/* if tag ends with \n, include empty line at end for typing */ /* if tag ends with \n, include empty line at end for typing */
n = w->tag.fr.nlines; n = w->tag.fr.nlines;
if(w->tag.file->b.nc > 0) if(w->tag.file->b.nc > 0){
bufread(&w->tag.file->b, w->tag.file->b.nc-1, &rune, 1); bufread(&w->tag.file->b, w->tag.file->b.nc-1, &rune, 1);
if(rune == '\n') if(rune == '\n')
n++; n++;
}
if(n == 0) if(n == 0)
n = 1; n = 1;
return n; return n;
@ -162,10 +163,8 @@ if(0) fprint(2, "winresize %d %R safe=%d keep=%d h=%d\n", w->id, r, safe, keepex
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;
mouseintag = ptinrect(mouse->xy, w->tag.all); mouseintag = ptinrect(mouse->xy, w->tag.all);
if(!safe || !w->tagsafe || !eqrect(w->tag.all, r1)){ if(!safe || !w->tagsafe || !eqrect(w->tag.all, r1))
w->taglines = wintaglines(w, r); w->taglines = wintaglines(w, r);
}
/* END TAG */ /* END TAG */
r1 = r; r1 = r;
@ -182,11 +181,18 @@ if(0) fprint(2, "=> %R (%R)\n", w->tag.all, w->tag.fr.r);
windrawbutton(w); windrawbutton(w);
w->tagsafe = TRUE; w->tagsafe = TRUE;
/* TAG */ /* TAG */
/* If mouse is in tag, pull up as tag closes. */
if(mouseintag && !ptinrect(mouse->xy, w->tag.all)){ if(mouseintag && !ptinrect(mouse->xy, w->tag.all)){
p = mouse->xy; p = mouse->xy;
p.y = w->tag.all.max.y-3; p.y = w->tag.all.max.y-3;
moveto(mousectl, p); moveto(mousectl, p);
} }
/* If mouse is in body, push down as tag expands. */
if(!mouseintag && ptinrect(mouse->xy, w->tag.all)){
p = mouse->xy;
p.y = w->tag.all.max.y+3;
moveto(mousectl, p);
}
/* END TAG */ /* END TAG */
} }