mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2684 (selected file must be into the visible area).

Browse Source 
After resize the window, the cursor line disappears, selected file was hide, but mustn't.

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
This commit is contained in:
Egmont Koblinger 2012-01-19 10:53:18 +04:00 committed by Andrew Borodin
parent c99bec62ba
commit 94ffb8ba37
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/filemanager/panel.c
View File

@ -1214,17 +1214,53 @@ show_dir (WPanel * panel)
}
/* --------------------------------------------------------------------------------------------- */
/** To be used only by long_frame and full_frame to adjust top_file */
/* Returns the number of items in the given panel */
static int
ITEMS (WPanel * p)
{
if (p->split)
return llines (p) * 2;
else
return llines (p);
}
/* --------------------------------------------------------------------------------------------- */
static void
adjust_top_file (WPanel * panel)
{
int old_top = panel->top_file;
int items = ITEMS (panel);
if (panel->selected - old_top > llines (panel))
panel->top_file = panel->selected;
if (old_top - panel->count > llines (panel))
panel->top_file = panel->count - llines (panel);
if (panel->count <= items)
{
/* If all files fit, show them all. */
panel->top_file = 0;
}
else
{
int i;
/* top_file has to be in the range [selected-items+1, selected] so that
the selected file is visible.
top_file should be in the range [0, count-items] so that there's
no empty space wasted.
Within these ranges, adjust it by as little as possible. */
if (panel->top_file < 0)
panel->top_file = 0;
i = panel->selected - items + 1;
if (panel->top_file < i)
panel->top_file = i;
i = panel->count - items;
if (panel->top_file > i)
panel->top_file = i;
if (panel->top_file > panel->selected)
panel->top_file = panel->selected;
}
}
/* --------------------------------------------------------------------------------------------- */
@ -1386,8 +1422,7 @@ paint_frame (WPanel * panel)
int side, width;
GString *format_txt;
if (!panel->split)
adjust_top_file (panel);
adjust_top_file (panel);
widget_erase (&panel->widget);
show_dir (panel);
@ -1818,18 +1853,6 @@ force_maybe_cd (void)
/* --------------------------------------------------------------------------------------------- */
/* Returns the number of items in the given panel */
static int
ITEMS (WPanel * p)
{
if (p->split)
return llines (p) * 2;
else
return llines (p);
}
/* --------------------------------------------------------------------------------------------- */
static void
unselect_item (WPanel * panel)
{
@ -4045,36 +4068,17 @@ panel_update_cols (Widget * widget, panel_display_t frame_size)
void
select_item (WPanel * panel)
{
int items = ITEMS (panel);
/* Although currently all over the code we set the selection and
top file to decent values before calling select_item, I could
forget it someday, so it's better to do the actual fitting here */
if (panel->top_file < 0)
panel->top_file = 0;
if (panel->selected < 0)
panel->selected = 0;
if (panel->selected > panel->count - 1)
panel->selected = panel->count - 1;
if (panel->top_file > panel->count - 1)
panel->top_file = panel->count - 1;
if ((panel->count - panel->top_file) < items)
{
panel->top_file = panel->count - items;
if (panel->top_file < 0)
panel->top_file = 0;
}
if (panel->selected < panel->top_file)
panel->top_file = panel->selected;
if ((panel->selected - panel->top_file) >= items)
panel->top_file = panel->selected - items + 1;
adjust_top_file (panel);
panel->dirty = 1;