From 4b7e4fb885a3d9aa7fa2152ee9439964a420ea20 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 25 May 2021 19:28:11 +0200 Subject: grid: reflow: slightly simplified logic for end-coordinate calculation --- grid.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/grid.c b/grid.c index 5a978e1c..d318c541 100644 --- a/grid.c +++ b/grid.c @@ -549,19 +549,17 @@ grid_resize_and_reflow( int uri_col = -1; int end; - if (tp != NULL && range != NULL) { - tp_col = tp->col + 1; + if (range != NULL) { uri_col = (range->start >= start ? range->start : range->end) + 1; - end = min(tp_col, uri_col); + + if (tp != NULL) { + tp_col = tp->col + 1; + end = min(tp_col, uri_col); + } else + end = uri_col; } else if (tp != NULL) end = tp_col = tp->col + 1; - else if (range != NULL) { - if (range->start >= start) - uri_col = range->start + 1; - else - uri_col = range->end + 1; - end = uri_col; - } else + else end = col_count; int cols = end - start; -- cgit v1.3