Menubar: ignore GPM_UP event.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-06-12 17:44:39 +04:00
parent 04883518fd
commit 498ee253da

View File

@ -2,9 +2,12 @@
Pulldown menu code Pulldown menu code
Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2007, 2009, 2011 2007, 2009, 2011, 2012
The Free Software Foundation, Inc. The Free Software Foundation, Inc.
Written by:
Andrew Borodin <aborodin@vmail.ru>, 2012
This file is part of the Midnight Commander. This file is part of the Midnight Commander.
The Midnight Commander is free software: you can redistribute it The Midnight Commander is free software: you can redistribute it
@ -602,6 +605,9 @@ menubar_event (Gpm_Event * event, void *data)
if (!menubar->is_active && ((event->buttons & (GPM_B_MIDDLE | GPM_B_UP | GPM_B_DOWN)) != 0)) if (!menubar->is_active && ((event->buttons & (GPM_B_MIDDLE | GPM_B_UP | GPM_B_DOWN)) != 0))
return MOU_NORMAL; return MOU_NORMAL;
if (event->y == 1 && (event->type & GPM_UP) != 0)
return MOU_NORMAL;
if (!menubar->is_dropped) if (!menubar->is_dropped)
{ {
menubar->previous_widget = dlg_get_current_widget_id (menubar->widget.owner); menubar->previous_widget = dlg_get_current_widget_id (menubar->widget.owner);
@ -613,9 +619,6 @@ menubar_event (Gpm_Event * event, void *data)
/* Mouse operations on the menubar */ /* Mouse operations on the menubar */
if (event->y == 1 || !was_active) if (event->y == 1 || !was_active)
{ {
if ((event->type & GPM_UP) != 0)
return MOU_NORMAL;
/* wheel events on menubar */ /* wheel events on menubar */
if (event->buttons & GPM_B_UP) if (event->buttons & GPM_B_UP)
menubar_left (menubar); menubar_left (menubar);