* layout.c (setup_panels): Clean the hint bar if it's enabled.

Bug reported by Adam Byrtek <alpha@debian.org>
This commit is contained in:
Pavel Roskin 2002-12-26 16:36:07 +00:00
parent da0c9299ad
commit 89804295bd
2 changed files with 20 additions and 12 deletions

View File

@ -1,4 +1,9 @@
2002-12-21 Adam Byrtek <alpha@debian.org> 2002-12-26 Pavel Roskin <proski@gnu.org>
* layout.c (setup_panels): Clean the hint bar if it's enabled.
Bug reported by Adam Byrtek <alpha@debian.org>
2002-12-26 Adam Byrtek <alpha@debian.org>
* main.c (update_xterm_title_path): New function, display * main.c (update_xterm_title_path): New function, display
current path in the xterm window title. current path in the xterm window title.

View File

@ -643,24 +643,26 @@ setup_panels (void)
int minimum; int minimum;
if (output_lines < 0) if (output_lines < 0)
output_lines = 0; output_lines = 0;
height = LINES - keybar_visible - command_prompt - menubar_visible height =
- output_lines - message_visible; LINES - keybar_visible - command_prompt - menubar_visible -
output_lines - message_visible;
minimum = MINHEIGHT * (1 + horizontal_split); minimum = MINHEIGHT * (1 + horizontal_split);
if (height < minimum) { if (height < minimum) {
output_lines -= minimum - height; output_lines -= minimum - height;
height = minimum; height = minimum;
} }
} else { } else {
height = LINES - menubar_visible - command_prompt - height =
keybar_visible - message_visible; LINES - menubar_visible - command_prompt - keybar_visible -
message_visible;
} }
check_split (); check_split ();
start_y = menubar_visible; start_y = menubar_visible;
/* The column computing is defered until panel_do_cols */ /* The column computing is defered until panel_do_cols */
if (horizontal_split) { if (horizontal_split) {
widget_set_size (panels[0].widget, start_y, 0, widget_set_size (panels[0].widget, start_y, 0, first_panel_size,
first_panel_size, 0); 0);
widget_set_size (panels[1].widget, start_y + first_panel_size, 0, widget_set_size (panels[1].widget, start_y + first_panel_size, 0,
height - first_panel_size, 0); height - first_panel_size, 0);
@ -698,18 +700,19 @@ setup_panels (void)
/* Output window */ /* Output window */
if (console_flag && output_lines) { if (console_flag && output_lines) {
output_start_y = LINES - command_prompt - keybar_visible - output_start_y =
output_lines; LINES - command_prompt - keybar_visible - output_lines;
show_console_contents (output_start_y, show_console_contents (output_start_y,
LINES - output_lines - keybar_visible - 1, LINES - output_lines - keybar_visible - 1,
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); 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); widget_set_size (&the_hint->widget, 0, 0, 0, 0);
load_hint ();
update_xterm_title_path (); update_xterm_title_path ();
} }