mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Merge branch '3757_two_plus_columns_broken'
* 3757_two_plus_columns_broken: Documentation: panels nowadays can display more than 2 columns. Ticket #3757: cannot show more than one column in user defined listing mode.
This commit is contained in:
commit
3078e74afe
@ -840,9 +840,10 @@ The user display format must start with a panel size specifier. This
|
||||
may be "half" or "full", and they specify a half screen panel and a
|
||||
full screen panel respectively.
|
||||
.PP
|
||||
After the panel size, you may specify the two columns mode on the
|
||||
panel, this is done by adding the number "2" to the user format
|
||||
string.
|
||||
After the panel size, you may specify how many listings to fit in the
|
||||
panel, side\-by\-side (in other words: how many times to repeat the
|
||||
fields horizontally). This defaults to 1. You may change this by adding a
|
||||
number from 1 to 9 to the format string.
|
||||
.PP
|
||||
After this you add the name of the fields with an optional size
|
||||
specifier. This are the available fields you may display:
|
||||
|
@ -1645,13 +1645,11 @@ parse_panel_size (WPanel * panel, const char *format, gboolean isstatus)
|
||||
|
||||
if (g_ascii_isdigit (*format))
|
||||
{
|
||||
if (!isstatus && panel->list_type == list_brief)
|
||||
if (!isstatus)
|
||||
{
|
||||
panel->brief_cols = g_ascii_digit_value (*format);
|
||||
if (panel->brief_cols < 1)
|
||||
panel->brief_cols = 1;
|
||||
|
||||
panel->list_cols = panel->brief_cols;
|
||||
panel->list_cols = g_ascii_digit_value (*format);
|
||||
if (panel->list_cols < 1)
|
||||
panel->list_cols = 1;
|
||||
}
|
||||
|
||||
format++;
|
||||
@ -3874,7 +3872,7 @@ panel_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
|
||||
{
|
||||
my_index = panel->top_file + y;
|
||||
|
||||
if (panel->list_type == list_brief && panel->list_cols > 1)
|
||||
if (panel->list_cols > 1)
|
||||
{
|
||||
int width, lines;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user