Skip to content

Ticket #5062: Ignore mouse click on a menu's separator line #5064

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
egmontkob merged 1 commit into from
Mar 14, 2026
+10 −2
Merged

Ticket #5062: Ignore mouse click on a menu's separator line #5064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions lib/widget/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,17 +728,25 @@ menubar_get_menu_by_x_coord (const WMenuBar *menubar, int x)

/* --------------------------------------------------------------------------------------------- */

/*
* Whether the mouse is over a dropped down menu entry (separators excluded).
*/
static gboolean
menubar_mouse_on_menu (const WMenuBar *menubar, int y, int x)
menubar_mouse_on_menu_entry (const WMenuBar *menubar, int y, int x)
{
const WRect *w = &CONST_WIDGET (menubar)->rect;
menu_t *menu;
menu_entry_t *entry;
int left_x, right_x, bottom_y;

if (!menubar->is_dropped)
return FALSE;

menu = MENU (g_list_nth_data (menubar->menu, menubar->current));
entry = MENUENTRY (g_list_nth_data (menu->entries, y - 2));
Copy link
Copy Markdown
Contributor

@mc-worker mc-worker Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If entry is NULL, we can immediately return FALSE. Following calculations are not make sense in this case.

Copy link
Copy Markdown
Contributor Author

@egmontkob egmontkob Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

if (entry == NULL)
return FALSE; // separator line

left_x = menu->start_x;
right_x = left_x + menu->max_entry_len + 2;
if (right_x > w->cols - 1)
Expand Down Expand Up @@ -782,7 +790,7 @@ menubar_mouse_callback (Widget *w, mouse_msg_t msg, mouse_event_t *event)
WMenuBar *menubar = MENUBAR (w);
gboolean mouse_on_drop;

mouse_on_drop = menubar_mouse_on_menu (menubar, event->y, event->x);
mouse_on_drop = menubar_mouse_on_menu_entry (menubar, event->y, event->x);

switch (msg)
{
Expand Down
Loading