Scrollbar and right window border (corrected)

When a scrollbar is on display in APP or TOD windows, the right
vertical border (outside the scrollbar) is not highlighted
when the window is selected.

The scrollbar is always highlighted:
- when APP or TOD is deselected
- in configuration windows where borders otherwise are not

The patch moves the scrollbar parameters (except highlight)
from arguments of draw_scrollbar() to the function itself.
The highlight argument was 1; instead it is set higher in
the call hierarchy (wins_update_panels()) and passed on down.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2017-12-17 08:25:10 +01:00
committed by Lukas Fleischer
parent a5cc46cd55
commit bb7381765c
9 changed files with 32 additions and 36 deletions

View File

@@ -355,7 +355,7 @@ void wins_scrollwin_draw_deco(struct scrollwin *sw, int hilt)
}
/* Display a scrolling window. */
void wins_scrollwin_display(struct scrollwin *sw)
void wins_scrollwin_display(struct scrollwin *sw, int hilt)
{
int inner_y = sw->y + (conf.compact_panels ? 1 : 3);
int inner_x = sw->x + 1;
@@ -363,7 +363,7 @@ void wins_scrollwin_display(struct scrollwin *sw)
int inner_w = sw->w - 2;
if (sw->line_num > inner_h)
draw_scrollbar(sw);
draw_scrollbar(sw, hilt);
wmove(win[STA].p, 0, 0);
wnoutrefresh(sw->win);
/*
@@ -547,9 +547,9 @@ void wins_update_border(int flags)
void wins_update_panels(int flags)
{
if (flags & FLAG_APP)
ui_day_update_panel(slctd_win);
ui_day_update_panel(slctd_win == APP);
if (flags & FLAG_TOD)
ui_todo_update_panel(slctd_win);
ui_todo_update_panel(slctd_win == TOD);
if (flags & FLAG_CAL)
ui_calendar_update_panel();
}