mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Merge branch '1704_quick_search'
* 1704_quick_search: Ticket #1704: fixed quick search show.
This commit is contained in:
commit
db11ade9d8
@ -752,6 +752,9 @@ 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)
|
||||||
{
|
{
|
||||||
|
if (!show_mini_info)
|
||||||
|
return;
|
||||||
|
|
||||||
widget_move (&panel->widget, llines (panel) + 3, 1);
|
widget_move (&panel->widget, llines (panel) + 3, 1);
|
||||||
|
|
||||||
if (panel->searching) {
|
if (panel->searching) {
|
||||||
@ -855,6 +858,7 @@ 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)
|
||||||
{
|
{
|
||||||
|
if (show_mini_info) {
|
||||||
const int y = llines (panel) + 2;
|
const int y = llines (panel) + 2;
|
||||||
|
|
||||||
tty_setcolor (NORMAL_COLOR);
|
tty_setcolor (NORMAL_COLOR);
|
||||||
@ -864,6 +868,7 @@ mini_info_separator (WPanel *panel)
|
|||||||
* 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
|
||||||
show_free_space (WPanel *panel)
|
show_free_space (WPanel *panel)
|
||||||
@ -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);
|
||||||
|
|
||||||
if (show_mini_info) {
|
|
||||||
mini_info_separator (panel);
|
mini_info_separator (panel);
|
||||||
display_mini_info (panel);
|
display_mini_info (panel);
|
||||||
}
|
|
||||||
|
|
||||||
panel->dirty = 0;
|
panel->dirty = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user