mirror of
https://github.com/0intro/wmii
synced 2024-11-22 05:42:05 +03:00
Fix stupid grow/nudge mistake. (and change an assert to a warning)
This commit is contained in:
parent
918fa1cf9d
commit
68f249f726
@ -45,8 +45,8 @@ wmiifocuscol=`{wi_readctl focuscolors}
|
||||
|
||||
fn wi_menu {
|
||||
dmenu -b -fn $wmiifont \
|
||||
-nf $wmiinormcol(1) -nb $wmiinormcol(2) \
|
||||
-sf $wmiifocuscol(1) -sb $wmiifocuscol(2)
|
||||
-nf $wmiinormcol(1) -nb $wmiinormcol(2) \
|
||||
-sf $wmiifocuscol(1) -sb $wmiifocuscol(2)
|
||||
}
|
||||
|
||||
fn wi_9menu {
|
||||
@ -156,7 +156,7 @@ fn wi_eventloop {
|
||||
wi_arg=`{echo $wi_event | sed 's/^[^ ]+ //'}}
|
||||
* = `{echo $wi_event}
|
||||
event = $1; shift
|
||||
Event-$event $*
|
||||
Event-$"event $*
|
||||
} >[2]/dev/null </dev/null
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,7 @@ float_detach(Frame *f) {
|
||||
v = f->view;
|
||||
a = f->area;
|
||||
sel = view_findarea(v, v->selcol, false);
|
||||
assert(sel || !v->area->next);
|
||||
if(!(sel || !v->area->next)) warning("%s:%d: !(sel || !v->area->next)", __FILE__, __LINE__);
|
||||
pr = f->aprev;
|
||||
|
||||
frame_remove(f);
|
||||
|
@ -652,7 +652,10 @@ msg_grow(View *v, IxpMsg *m) {
|
||||
if(!getamt(m, &amount))
|
||||
return Ebadvalue;
|
||||
|
||||
r = f->colr;
|
||||
if(f->area->floating)
|
||||
r = f->r;
|
||||
else
|
||||
r = f->colr;
|
||||
switch(dir) {
|
||||
case LLEFT: r.min.x -= amount.x; break;
|
||||
case LRIGHT: r.max.x += amount.x; break;
|
||||
@ -689,7 +692,10 @@ msg_nudge(View *v, IxpMsg *m) {
|
||||
if(!getamt(m, &amount))
|
||||
return Ebadvalue;
|
||||
|
||||
r = f->colr;
|
||||
if(f->area->floating)
|
||||
r = f->r;
|
||||
else
|
||||
r = f->colr;
|
||||
switch(dir) {
|
||||
case LLEFT: r = rectaddpt(r, Pt(-amount.x, 0)); break;
|
||||
case LRIGHT: r = rectaddpt(r, Pt( amount.x, 0)); break;
|
||||
|
Loading…
Reference in New Issue
Block a user