From 86af6925d9fc0b2656eac15b0c8c7aba60589ce5 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 20 Apr 2020 16:09:40 +0200 Subject: Simplify win_refresh_with_subwin() --- src/ui/window.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ui/window.c b/src/ui/window.c index 8bfc216e..a121769a 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -738,22 +738,21 @@ win_refresh_without_subwin(ProfWin *window) void win_refresh_with_subwin(ProfWin *window) { + int subwin_cols; int cols = getmaxx(stdscr); - int subwin_cols = 0; - int row_start = screen_mainwin_row_start(); int row_end = screen_mainwin_row_end(); + if (window->type == WIN_MUC) { ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout; subwin_cols = win_occpuants_cols(); - pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1); - pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, row_start, (cols-subwin_cols), row_end, cols-1); } else if (window->type == WIN_CONSOLE) { ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout; subwin_cols = win_roster_cols(); - pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1); - pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, row_start, (cols-subwin_cols), row_end, cols-1); } + + pnoutrefresh(layout->base.win, layout->base.y_pos, 0, row_start, 0, row_end, (cols-subwin_cols)-1); + pnoutrefresh(layout->subwin, layout->sub_y_pos, 0, row_start, (cols-subwin_cols), row_end, cols-1); } void -- cgit 1.4.1-2-gfad0