mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

WMenuBar: execute menu item after drag action.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-02-07 11:42:42 +03:00
parent cae293b4d7
commit fa4e69b3b4
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/widget/menu.c
View File

@ -698,6 +698,8 @@ menubar_change_selected_item (WMenuBar * menubar, int y)
static void static void
menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
{ {
static gboolean was_drag = FALSE;
WMenuBar *menubar = MENUBAR (w); WMenuBar *menubar = MENUBAR (w);
gboolean mouse_on_drop; gboolean mouse_on_drop;
@ -706,6 +708,8 @@ menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
switch (msg) switch (msg)
{ {
case MSG_MOUSE_DOWN: case MSG_MOUSE_DOWN:
was_drag = FALSE;
if (event->y == 0) if (event->y == 0)
{ {
/* events on menubar */ /* events on menubar */
@ -747,7 +751,15 @@ menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
} }
break; break;
case MSG_MOUSE_UP:
if (was_drag && mouse_on_drop)
menubar_execute (menubar);
was_drag = FALSE;
break;
case MSG_MOUSE_CLICK: case MSG_MOUSE_CLICK:
was_drag = FALSE;
if ((event->buttons & GPM_B_MIDDLE) != 0 && event->y > 0 && menubar->is_dropped) if ((event->buttons & GPM_B_MIDDLE) != 0 && event->y > 0 && menubar->is_dropped)
{ {
/* middle click -- everywhere */ /* middle click -- everywhere */
@ -768,10 +780,14 @@ menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
} }
else if (mouse_on_drop) else if (mouse_on_drop)
menubar_change_selected_item (menubar, event->y); menubar_change_selected_item (menubar, event->y);
was_drag = TRUE;
break; break;
case MSG_MOUSE_SCROLL_UP: case MSG_MOUSE_SCROLL_UP:
case MSG_MOUSE_SCROLL_DOWN: case MSG_MOUSE_SCROLL_DOWN:
was_drag = FALSE;
if (menubar->is_active) if (menubar->is_active)
{ {
if (event->y == 0) if (event->y == 0)
@ -794,6 +810,7 @@ menubar_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
break; break;
default: default:
was_drag = FALSE;
break; break;
} }
} }