Merge remote-tracking branch 'origin/52-add-escape-shortcut-to-open-quit-menu' into main/yubo-dev

nel/src/gui/widget_manager.cpp

@@ -2319,16 +2319,16 @@ namespace NLGUI
 				SModalWndInfo mwi = getModal();
 				if (mwi.ModalExitKeyPushed)
 					disableModalWindow();
-			}
+
+				handled= true;
 			}
 			
-		// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
-		if( eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE )
-		{
-			// Get the last escapable active top window. NB: this is ergonomically better.
 			CInterfaceGroup	*win= getLastEscapableTopWindow();
 			if ( win )
 			{
+				// Manage "quit window" If the Key is ESCAPE, no captureKeyboard
+				// Get the last escapable active top window. NB: this is ergonomically better.
+
 				// If the window is a modal, must pop it.
 				if( dynamic_cast<CGroupModal*>(win) )
 				{
@@ -2414,6 +2414,12 @@ namespace NLGUI
 			}
 		}
 
+	    if (eventDesc.getKeyEventType() == CEventDescriptorKey::keydown && eventDesc.getKey() == NLMISC::KeyESCAPE && !handled && !isKeyboardCaptured())
+	    {
+		    CAHManager::getInstance()->runActionHandler("enter_modal", NULL, "group=ui:interface:quit_dialog");
+		    handled = true;
+	    }
+
 	    // General case: handle it in the Captured keyboard
 		if ( getCaptureKeyboard() != NULL && !handled)
 		{