From d6b2ae879a2e7f3b6aea1ed1dbb092c5e6d7d141 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Thu, 24 Oct 2002 22:53:01 +0000 Subject: [PATCH] * screen.c (mini_info_separator): The separator was one character too long. (show_dir): Remove obsolete linux_unicode hack. --- src/ChangeLog | 4 ++++ src/screen.c | 39 +++++++++++++++------------------------ 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f18687620..bf41a446c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2002-10-24 Pavel Roskin + * screen.c (mini_info_separator): The separator was one + character too long. + (show_dir): Remove obsolete linux_unicode hack. + * dlg.c (init_dlg): Redraw screen after selecting the focused widget, not before. The bug affected file progress dialog with verbose operation off. diff --git a/src/screen.c b/src/screen.c index 7578f0162..fe12f45b7 100644 --- a/src/screen.c +++ b/src/screen.c @@ -683,44 +683,35 @@ mini_info_separator (WPanel *panel) return; standend (); - widget_move (&panel->widget, llines (panel)+2, 1); + widget_move (&panel->widget, llines (panel) + 2, 1); #ifdef HAVE_SLANG attrset (NORMAL_COLOR); - hline (ACS_HLINE, panel->widget.cols-2); + hline (ACS_HLINE, panel->widget.cols - 3); #else hline ((slow_terminal ? '-' : ACS_HLINE) | NORMAL_COLOR, - panel->widget.cols-2); -#endif /* !HAVE_SLANG */ + panel->widget.cols - 3); +#endif /* !HAVE_SLANG */ } static void show_dir (WPanel *panel) { - char tmp [200]; + char tmp[200]; set_colors (panel); draw_double_box (panel->widget.parent, - panel->widget.y, panel->widget.x, - panel->widget.lines, panel->widget.cols); + panel->widget.y, panel->widget.x, + panel->widget.lines, panel->widget.cols); #ifdef HAVE_SLANG if (show_mini_info) { -#ifdef linux_unicode - if (SLtt_Unicode) { - SLsmg_draw_unicode (panel->widget.y + llines (panel) + 2, - panel->widget.x, SLUNI_DSLTEE_CHAR); - SLsmg_draw_unicode (panel->widget.y + llines (panel) + 2, - panel->widget.x + panel->widget.cols - 1, SLUNI_DSRTEE_CHAR); - } else -#endif /* linux_unicode */ - { - SLsmg_draw_object (panel->widget.y + llines (panel) + 2, - panel->widget.x, SLSMG_LTEE_CHAR); - SLsmg_draw_object (panel->widget.y + llines (panel) + 2, - panel->widget.x + panel->widget.cols - 1, SLSMG_RTEE_CHAR); - } + SLsmg_draw_object (panel->widget.y + llines (panel) + 2, + panel->widget.x, SLSMG_LTEE_CHAR); + SLsmg_draw_object (panel->widget.y + llines (panel) + 2, + panel->widget.x + panel->widget.cols - 1, + SLSMG_RTEE_CHAR); } -#endif /* HAVE_SLANG */ +#endif /* HAVE_SLANG */ if (panel->active) attrset (REVERSE_COLOR); @@ -732,9 +723,9 @@ show_dir (WPanel *panel) addstr (tmp); widget_move (&panel->widget, 0, 1); addstr ("<"); - widget_move (&panel->widget, 0, panel->widget.cols-2); + widget_move (&panel->widget, 0, panel->widget.cols - 2); addstr (">"); - widget_move (&panel->widget, 0, panel->widget.cols-3); + widget_move (&panel->widget, 0, panel->widget.cols - 3); addstr ("v"); if (panel->active)