[hackers] [wmii] Fix some managed grabbox move bugs. || Kris Maglione

changeset: 2671:e6546cde2d67
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Sat May 29 11:38:35 2010 -0400
files: cmd/wmii/frame.c cmd/wmii/layout.c
description:
Fix some managed grabbox move bugs.

diff -r bc83f33f5cd6 -r e6546cde2d67 cmd/wmii/frame.c
--- a/cmd/wmii/frame.c Sat May 29 10:37:51 2010 -0400
+++ b/cmd/wmii/frame.c Sat May 29 11:38:35 2010 -0400
@@ -620,7 +620,7 @@
         if(old_a != v->oldsel && f != old_f)
                 v->oldsel = nil;
 
- if(v != selview || a != v->sel)
+ if(v != selview || a != v->sel || resizing)
                 return;
 
         move_focus(old_f, f);
diff -r bc83f33f5cd6 -r e6546cde2d67 cmd/wmii/layout.c
--- a/cmd/wmii/layout.c Sat May 29 10:37:51 2010 -0400
+++ b/cmd/wmii/layout.c Sat May 29 11:38:35 2010 -0400
@@ -377,10 +377,13 @@
 static void
 column_drop(Area *a, Frame *f, int y) {
         Frame *ff;
- int dy;
+ int dy, extra_y;
 
- for(ff=a->frame; ff; ff=ff->anext)
+ extra_y = Dy(a->r);
+ for(ff=a->frame; ff; ff=ff->anext) {
                 assert(ff != f);
+ extra_y -= Dy(ff->colr);
+ }
 
         if(a->frame == nil || y <= a->frame->r.min.y) {
                 f->collapsed = true;
@@ -403,7 +406,7 @@
                 column_openstack(a, ff, labelh(def.font) - dy);
         }else {
                 f->colr.min.y = y;
- f->colr.max.y = ff->colr.max.y;
+ f->colr.max.y = ff->colr.max.y + extra_y;
                 ff->colr.max.y = y;
         }
         column_insert(a, f, ff);
Received on Sat May 29 2010 - 15:38:39 UTC