From bf606f3f23688f54b4f5e0da34348889dcadff91 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Sat, 19 Dec 2015 20:48:08 +0100
Subject: [PATCH] Close sub-menu on right and middle click

---
 src/fmenu.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/fmenu.cpp b/src/fmenu.cpp
index 512deead..13cc7b30 100644
--- a/src/fmenu.cpp
+++ b/src/fmenu.cpp
@@ -933,6 +933,8 @@ void FMenu::onKeyPress (FKeyEvent* ev)
       else
       {
         hideSuperMenus();
+        if ( statusBar() )
+          statusBar()->clearMessage();
         activatePrevWindow();
         raiseWindow (getActiveWindow());
         getActiveWindow()->getFocusWidget()->setFocus();
@@ -956,7 +958,18 @@ void FMenu::onKeyPress (FKeyEvent* ev)
 void FMenu::onMouseDown (FMouseEvent* ev)
 {
   if ( ev->getButton() != LeftButton )
+  {
+    if ( open_sub_menu )
+    {
+      // close open sub menu
+      open_sub_menu->hideSubMenus();
+      open_sub_menu->hide();
+      open_sub_menu = 0;
+      updateTerminal();
+      flush_out();
+    }
     return;
+  }
 
   if ( mouse_down )
     return;