mirror of
https://github.com/0intro/wmii
synced 2024-11-30 01:23:12 +03:00
merge
This commit is contained in:
commit
88c123d1b4
3
draw.c
3
draw.c
@ -58,7 +58,8 @@ loadfont(Blitz *blitz, BlitzFont *font) {
|
||||
BLITZ_FONT);
|
||||
free(font->fontstr);
|
||||
font->fontstr = ixp_estrdup(BLITZ_FONT);
|
||||
return loadfont(blitz, font);
|
||||
loadfont(blitz, font);
|
||||
return;
|
||||
}
|
||||
font->ascent = font->xfont->ascent;
|
||||
font->descent = font->xfont->descent;
|
||||
|
6
mouse.c
6
mouse.c
@ -330,8 +330,10 @@ do_mouse_resize(Client *c, BlitzAlign align) {
|
||||
snap = floating ? screen->rect.height / 66 : 0;
|
||||
cur = cursor[CurResize];
|
||||
|
||||
if(!floating && (align == CENTER))
|
||||
return do_managed_move(c);
|
||||
if(!floating && (align == CENTER)) {
|
||||
do_managed_move(c);
|
||||
return;
|
||||
}
|
||||
|
||||
XQueryPointer(blz.dpy, c->framewin, &dummy, &dummy, &i, &i, &pt_x, &pt_y, &di);
|
||||
rx = (float)pt_x / frect.width;
|
||||
|
Loading…
Reference in New Issue
Block a user