From 89804295bdf699b0b3204534d2751341d727c7af Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 26 Dec 2002 16:36:07 +0000 Subject: [PATCH] * layout.c (setup_panels): Clean the hint bar if it's enabled. Bug reported by Adam Byrtek --- src/ChangeLog | 7 ++++++- src/layout.c | 25 ++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c2dde812c..d2c645f0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,9 @@ -2002-12-21 Adam Byrtek +2002-12-26 Pavel Roskin + + * layout.c (setup_panels): Clean the hint bar if it's enabled. + Bug reported by Adam Byrtek + +2002-12-26 Adam Byrtek * main.c (update_xterm_title_path): New function, display current path in the xterm window title. diff --git a/src/layout.c b/src/layout.c index 3a6221c80..a22d974e0 100644 --- a/src/layout.c +++ b/src/layout.c @@ -643,24 +643,26 @@ setup_panels (void) int minimum; if (output_lines < 0) output_lines = 0; - height = LINES - keybar_visible - command_prompt - menubar_visible - - output_lines - message_visible; + height = + LINES - keybar_visible - command_prompt - menubar_visible - + output_lines - message_visible; minimum = MINHEIGHT * (1 + horizontal_split); if (height < minimum) { output_lines -= minimum - height; height = minimum; } } else { - height = LINES - menubar_visible - command_prompt - - keybar_visible - message_visible; + height = + LINES - menubar_visible - command_prompt - keybar_visible - + message_visible; } check_split (); start_y = menubar_visible; /* The column computing is defered until panel_do_cols */ if (horizontal_split) { - widget_set_size (panels[0].widget, start_y, 0, - first_panel_size, 0); + widget_set_size (panels[0].widget, start_y, 0, first_panel_size, + 0); widget_set_size (panels[1].widget, start_y + first_panel_size, 0, height - first_panel_size, 0); @@ -698,18 +700,19 @@ setup_panels (void) /* Output window */ if (console_flag && output_lines) { - output_start_y = LINES - command_prompt - keybar_visible - - output_lines; + output_start_y = + LINES - command_prompt - keybar_visible - output_lines; show_console_contents (output_start_y, LINES - output_lines - keybar_visible - 1, LINES - keybar_visible - 1); } - if (message_visible) + if (message_visible) { widget_set_size (&the_hint->widget, height + start_y, 0, 1, COLS); - else + set_hintbar (""); /* clean up the line */ + load_hint (); + } else widget_set_size (&the_hint->widget, 0, 0, 0, 0); - load_hint (); update_xterm_title_path (); }