From 61ed5f835cae29ce6405ec34a7e310d5ea90327b Mon Sep 17 00:00:00 2001 From: Morgan Seltzer Date: Mon, 14 Jun 2021 15:51:46 -0400 Subject: Fixed sidebar config sometime not increasing width The sidebar has a numerical mimumum width that is statically defined, and users may set the width of the sidebar in config by incrementing the percentage of the screen between this minimum and a maximum value of 50%. However, internally the mimimum percentage could be set as low as zero, and while that did not decrease the sidebar size below the numerical minimum width, did mean that between 0 and the mimimum width increasing the percentage had no visual effect to indicate change. Now the mimimum percent is not decremented below the mimimum width. Signed-off-by: Morgan Seltzer Signed-off-by: Lukas Fleischer --- src/vars.c | 2 ++ src/wins.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vars.c b/src/vars.c index df27fbc..ac0fb4f 100644 --- a/src/vars.c +++ b/src/vars.c @@ -175,6 +175,8 @@ void vars_init(void) ui_calendar_set_first_day_of_week(MONDAY); + wins_set_sbar_width(col * SBARMINWIDTH / 100); + /* Pad structure to scroll text inside the appointment panel */ apad.length = 1; apad.first_onscreen = 0; diff --git a/src/wins.c b/src/wins.c index d66ec65..fa4874b 100644 --- a/src/wins.c +++ b/src/wins.c @@ -229,7 +229,7 @@ void wins_sbar_winc(void) void wins_sbar_wdec(void) { - if (sbarwidth_perc > 0) + if (col * sbarwidth_perc / 100 > SBARMINWIDTH) sbarwidth_perc--; } -- cgit v1.2.3-54-g00ecf