 |
updategeom: small refactoring - sfeed_curses - sfeed curses UI (now part of sfe… |
 |
git clone git://git.codemadness.org/sfeed_curses |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 95ef55218f09c78d2470581ec5640e5f05bca7b4 |
|
parent a210870a4f574df86886f2891e98b3ad12b257af |
|
Author: Hiltjo Posthuma <[email protected]> |
|
Date: Sun, 14 Feb 2021 18:00:52 +0100 |
|
|
|
updategeom: small refactoring |
|
|
|
Diffstat: |
|
M sfeed_curses.c | 8 +++++--- |
|
|
|
1 file changed, 5 insertions(+), 3 deletions(-) |
|
--- |
|
diff --git a/sfeed_curses.c b/sfeed_curses.c |
|
@@ -26,6 +26,7 @@ |
|
#endif |
|
|
|
#define LEN(a) sizeof((a))/sizeof((a)[0]) |
|
+#define MAX(a,b) ((a) > (b) ? (a) : (b)) |
|
|
|
#define PAD_TRUNCATE_SYMBOL "\xe2\x80\xa6" /* symbol: "ellipsis" */ |
|
#define SCROLLBAR_SYMBOL_BAR "\xe2\x94\x82" /* symbol: "light vertical" */ |
|
@@ -861,7 +862,7 @@ updategeom(void) |
|
panes[PaneFeeds].x = 0; |
|
panes[PaneFeeds].y = 0; |
|
/* reserve space for statusbar */ |
|
- panes[PaneFeeds].height = win.height > 1 ? win.height - 1 : 1; |
|
+ panes[PaneFeeds].height = MAX(win.height - 1, 1); |
|
|
|
/* NOTE: updatesidebar() must happen before this function for the |
|
remaining width */ |
|
@@ -877,9 +878,10 @@ updategeom(void) |
|
} |
|
|
|
panes[PaneItems].x = x; |
|
- panes[PaneItems].width = w > 0 ? w - 1 : 0; /* rest and space for scro… |
|
+ panes[PaneItems].width = MAX(w - 1, 0); /* rest and space for scrollba… |
|
panes[PaneItems].height = panes[PaneFeeds].height; |
|
panes[PaneItems].y = panes[PaneFeeds].y; |
|
+ panes[PaneItems].hidden = !panes[PaneItems].width || !panes[PaneItems]… |
|
|
|
scrollbars[PaneFeeds].x = panes[PaneFeeds].x + panes[PaneFeeds].width; |
|
scrollbars[PaneFeeds].y = panes[PaneFeeds].y; |
|
@@ -889,7 +891,7 @@ updategeom(void) |
|
scrollbars[PaneItems].x = panes[PaneItems].x + panes[PaneItems].width; |
|
scrollbars[PaneItems].y = panes[PaneItems].y; |
|
scrollbars[PaneItems].size = panes[PaneItems].height; |
|
- scrollbars[PaneItems].hidden = panes[PaneItems].width ? 0 : 1; |
|
+ scrollbars[PaneItems].hidden = panes[PaneItems].hidden; |
|
|
|
/* statusbar below */ |
|
statusbar.width = win.width; |
