From 1f45b0822e5f2424af1fdb50cb4e5a25a7ad1218 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 12 Jun 2012 17:44:39 +0400 Subject: [PATCH] Menubar: ignore GPM_UP event. Signed-off-by: Andrew Borodin --- lib/widget/menu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/widget/menu.c b/lib/widget/menu.c index 67a2683f7..abf64382e 100644 --- a/lib/widget/menu.c +++ b/lib/widget/menu.c @@ -2,9 +2,12 @@ Pulldown menu code Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007, 2009, 2011 + 2007, 2009, 2011, 2012 The Free Software Foundation, Inc. + Written by: + Andrew Borodin , 2012 + This file is part of the Midnight Commander. The Midnight Commander is free software: you can redistribute it @@ -622,6 +625,11 @@ menubar_event (Gpm_Event * event, void *data) if (!menubar->is_active && ((event->buttons & (GPM_B_MIDDLE | GPM_B_UP | GPM_B_DOWN)) != 0)) return MOU_NORMAL; + local = mouse_get_local (event, w); + + if (local.y == 1 && (local.type & GPM_UP) != 0) + return MOU_NORMAL; + if (!menubar->is_dropped) { menubar->previous_widget = dlg_get_current_widget_id (w->owner); @@ -630,14 +638,9 @@ menubar_event (Gpm_Event * event, void *data) was_active = FALSE; } - local = mouse_get_local (event, w); - /* Mouse operations on the menubar */ if (local.y == 1 || !was_active) { - if ((local.type & GPM_UP) != 0) - return MOU_NORMAL; - /* wheel events on menubar */ if ((local.buttons & GPM_B_UP) != 0) menubar_left (menubar);