fbt
/
lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #150 from neeasade/monitor_sort 

Fix monitor sorting with mix of portrait and landscape layout.
This commit is contained in:
Giuseppe 2015-10-21 19:30:56 +02:00
parent b331ee3927 7f8a79131b
commit 1585d7257d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,5 +1,4 @@
config.h lemonbar
bar
*.o *.o
*.swp *.swp
*~ *~

13
lemonbar.c
View File

@ -541,7 +541,7 @@ parse (char *text)
break; break;
case 'T': case 'T':
if (*p == '-') { //Reset to automatic font selection if (*p == '-') { //Reset to automatic font selection
font_index = -1; font_index = -1;
p++; p++;
break; break;
@ -784,10 +784,15 @@ rect_sort_cb (const void *p1, const void *p2)
const xcb_rectangle_t *r1 = (xcb_rectangle_t *)p1; const xcb_rectangle_t *r1 = (xcb_rectangle_t *)p1;
const xcb_rectangle_t *r2 = (xcb_rectangle_t *)p2; const xcb_rectangle_t *r2 = (xcb_rectangle_t *)p2;
if (r1->x < r2->x || r1->y < r2->y) if (r1->x < r2->x || r1->y + r1->height <= r2->y)
{
return -1; return -1;
if (r1->x > r2->x || r1->y > r2->y) }
return 1;
if (r1->x > r2->x || r1->y + r1->height > r2->y)
{
return 1;
}
return 0; return 0;
} }