From 177deb0860c3e6ac443f3560978f31672e31ed05 Mon Sep 17 00:00:00 2001 From: neeasade Date: Sun, 12 Apr 2015 08:07:57 -0500 Subject: [PATCH 1/2] bar -> lemonbar in .gitignore, remove config.h in .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 519ae3a..01a163f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -config.h -bar +lemonbar *.o *.swp *~ From 7f8a79131b39ff63d2b91eacc252417dca3211bd Mon Sep 17 00:00:00 2001 From: Nathan Isom Date: Wed, 21 Oct 2015 00:22:52 -0500 Subject: [PATCH 2/2] Account for height of monitors in sorting. --- lemonbar.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lemonbar.c b/lemonbar.c index 065ecd6..39c4975 100644 --- a/lemonbar.c +++ b/lemonbar.c @@ -541,7 +541,7 @@ parse (char *text) break; case 'T': - if (*p == '-') { //Reset to automatic font selection + if (*p == '-') { //Reset to automatic font selection font_index = -1; p++; 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 *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; - 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; }