mirror of
https://github.com/MidnightCommander/mc
synced 2025-01-03 10:04:32 +03:00
Ticket #1704: fixed quick search show.
If "show Mini status" option is off, the quick search box is shown incorrect. In this case the quick seach box must be invisible, because this is common MC behavior. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
fac2020acf
commit
10e8d008d7
37
src/screen.c
37
src/screen.c
@ -752,13 +752,16 @@ repaint_file (WPanel *panel, int file_index, int mv, int attr, int isstatus)
|
|||||||
static void
|
static void
|
||||||
display_mini_info (WPanel *panel)
|
display_mini_info (WPanel *panel)
|
||||||
{
|
{
|
||||||
widget_move (&panel->widget, llines (panel)+3, 1);
|
if (!show_mini_info)
|
||||||
|
return;
|
||||||
|
|
||||||
if (panel->searching){
|
widget_move (&panel->widget, llines (panel) + 3, 1);
|
||||||
|
|
||||||
|
if (panel->searching) {
|
||||||
tty_setcolor (INPUT_COLOR);
|
tty_setcolor (INPUT_COLOR);
|
||||||
tty_print_char ('/');
|
tty_print_char ('/');
|
||||||
tty_print_string (str_fit_to_term (panel->search_buffer,
|
tty_print_string (str_fit_to_term (panel->search_buffer,
|
||||||
panel->widget.cols - 3, J_LEFT));
|
panel->widget.cols - 3, J_LEFT));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -855,14 +858,16 @@ display_total_marked_size (WPanel *panel, int y, int x, gboolean size_only)
|
|||||||
static void
|
static void
|
||||||
mini_info_separator (WPanel *panel)
|
mini_info_separator (WPanel *panel)
|
||||||
{
|
{
|
||||||
const int y = llines (panel) + 2;
|
if (show_mini_info) {
|
||||||
|
const int y = llines (panel) + 2;
|
||||||
|
|
||||||
tty_setcolor (NORMAL_COLOR);
|
tty_setcolor (NORMAL_COLOR);
|
||||||
tty_draw_hline (panel->widget.y + y, panel->widget.x + 1,
|
tty_draw_hline (panel->widget.y + y, panel->widget.x + 1,
|
||||||
ACS_HLINE, panel->widget.cols - 2);
|
ACS_HLINE, panel->widget.cols - 2);
|
||||||
/* Status displays total marked size.
|
/* Status displays total marked size.
|
||||||
* Centered in panel, full format. */
|
* Centered in panel, full format. */
|
||||||
display_total_marked_size (panel, y, -1, FALSE);
|
display_total_marked_size (panel, y, -1, FALSE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -985,12 +990,8 @@ paint_panel (WPanel *panel)
|
|||||||
{
|
{
|
||||||
paint_frame (panel); /* including show_dir */
|
paint_frame (panel); /* including show_dir */
|
||||||
paint_dir (panel);
|
paint_dir (panel);
|
||||||
|
mini_info_separator (panel);
|
||||||
if (show_mini_info) {
|
display_mini_info (panel);
|
||||||
mini_info_separator (panel);
|
|
||||||
display_mini_info (panel);
|
|
||||||
}
|
|
||||||
|
|
||||||
panel->dirty = 0;
|
panel->dirty = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user