mirrors
/
wmii
mirror of https://github.com/0intro/wmii
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix returning from fullscreen. Closes issue #104. Closes issue #22.

This commit is contained in:
Kris Maglione 2009-10-02 16:21:12 -04:00
parent ebd63a2aa7
commit 5ce54fd1b5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/wmii/column.c
View File

@ -295,23 +295,14 @@ column_attachrect(Area *a, Frame *f, Rectangle r) {
pos = nil;
for(fp=a->frame; fp; pos=fp, fp=fp->anext) {
if(r.max.y < fp->r.min.y)
if(r.max.y < fp->r.min.y || r.min.y > fp->r.max.y)
continue;
before = fp->r.min.y - r.min.y;
after = r.max.y - fp->r.max.y;
if(abs(before) <= abs(after))
break;
}
if(Dy(a->r) > Dy(r)) {
/* Kludge. */
before = a->r.max.y;
a->r.max.y -= Dy(r);
column_scale(a);
a->r.max.y = before;
after = -fp->r.max.y + r.max.y;
}
column_insert(a, f, pos);
column_scale(a);
column_resizeframe_h(f, r);
column_scale(a);
}
void
@ -674,7 +665,7 @@ column_resizeframe_h(Frame *f, Rectangle r) {
if(fp)
r.min.y = max(r.min.y, fp->colr.min.y + minh);
else /* XXX. */
else
r.min.y = max(r.min.y, a->r.min.y);
if(fn)
@ -686,10 +677,15 @@ column_resizeframe_h(Frame *f, Rectangle r) {
fp->colr.max.y = r.min.y;
frame_resize(fp, fp->colr);
}
else
r.min.y = min(r.min.y, r.max.y - minh);
if(fn) {
fn->colr.min.y = r.max.y;
frame_resize(fn, fn->colr);
}
else
r.max.y = max(r.max.y, r.min.y + minh);
f->colr = r;
frame_resize(f, r);