Skip to content

Ticket #4911: menu padding #4912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2025
+16 −14
Merged

Ticket #4911: menu padding #4912

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e496579
Ticket #4911: Fix the amount of right padding in menus
egmontkob Nov 25, 2025
a74dac1
Ticket #4911: Fix horizontal mouse coordinates in menus
egmontkob Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions lib/widget/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@ menu_arrange (menu_t *menu, dlg_shortcut_str get_shortcut)
}
}

menu->max_entry_len = menu->max_hotkey_len + max_shortcut_len;
// shortcuts, if present, are separated by 2 spaces
menu->max_entry_len =
menu->max_hotkey_len + (max_shortcut_len > 0 ? max_shortcut_len + 2 : 0);
}
}

Expand All @@ -129,8 +131,8 @@ menubar_paint_idx (const WMenuBar *menubar, unsigned int idx, int color)
const int y = 2 + idx;
int x = menu->start_x;

if (x + menu->max_entry_len + 4 > (gsize) w->cols)
x = w->cols - menu->max_entry_len - 4;
if (x + menu->max_entry_len + 3 > (gsize) w->cols)
x = w->cols - menu->max_entry_len - 3;

if (entry == NULL)
{
Expand All @@ -139,8 +141,8 @@ menubar_paint_idx (const WMenuBar *menubar, unsigned int idx, int color)

widget_gotoyx (menubar, y, x - 1);
tty_print_char (mc_tty_frm[MC_TTY_FRM_DLEFTMIDDLE]);
tty_draw_hline (w->y + y, w->x + x, mc_tty_frm[MC_TTY_FRM_HORIZ], menu->max_entry_len + 3);
widget_gotoyx (menubar, y, x + menu->max_entry_len + 3);
tty_draw_hline (w->y + y, w->x + x, mc_tty_frm[MC_TTY_FRM_HORIZ], menu->max_entry_len + 2);
widget_gotoyx (menubar, y, x + menu->max_entry_len + 2);
tty_print_char (mc_tty_frm[MC_TTY_FRM_DRIGHTMIDDLE]);
}
else
Expand All @@ -152,7 +154,7 @@ menubar_paint_idx (const WMenuBar *menubar, unsigned int idx, int color)
widget_gotoyx (menubar, y, x);
tty_print_char ((unsigned char) entry->first_letter);
tty_getyx (&yt, &xt);
tty_draw_hline (yt, xt, ' ', menu->max_entry_len + 2); // clear line
tty_draw_hline (yt, xt, ' ', menu->max_entry_len + 1); // clear line
tty_print_string (entry->text.start);

if (entry->text.hotkey != NULL)
Expand Down Expand Up @@ -187,15 +189,15 @@ menubar_draw_drop (const WMenuBar *menubar)
int column = menu->start_x - 1;
unsigned int i;

if (column + menu->max_entry_len + 5 > (gsize) w->cols)
column = w->cols - menu->max_entry_len - 5;
if (column + menu->max_entry_len + 4 > (gsize) w->cols)
column = w->cols - menu->max_entry_len - 4;

if (mc_global.tty.shadows)
tty_draw_box_shadow (w->y + 1, w->x + column, count + 2, menu->max_entry_len + 5,
tty_draw_box_shadow (w->y + 1, w->x + column, count + 2, menu->max_entry_len + 4,
SHADOW_COLOR);

tty_setcolor (MENU_ENTRY_COLOR);
tty_draw_box (w->y + 1, w->x + column, count + 2, menu->max_entry_len + 5, FALSE);
tty_draw_box (w->y + 1, w->x + column, count + 2, menu->max_entry_len + 4, FALSE);

for (i = 0; i < count; i++)
menubar_paint_idx (menubar, i, i == menu->current ? MENU_SELECTED_COLOR : MENU_ENTRY_COLOR);
Expand Down Expand Up @@ -738,11 +740,11 @@ menubar_mouse_on_menu (const WMenuBar *menubar, int y, int x)

menu = MENU (g_list_nth_data (menubar->menu, menubar->current));
left_x = menu->start_x;
right_x = left_x + menu->max_entry_len + 3;
if (right_x > w->cols)
right_x = left_x + menu->max_entry_len + 2;
if (right_x > w->cols - 1)
{
left_x = w->cols - (menu->max_entry_len + 3);
right_x = w->cols;
left_x = w->cols - 1 - (menu->max_entry_len + 2);
right_x = w->cols - 1;
}

bottom_y = g_list_length (menu->entries) + 2; // skip bar and top frame
Expand Down
Loading