Procházet zdrojové kódy

Merge pull request #802 from BDisp/mouse-run-action

Fixes #800. Menu IsTopLevel executes on button clicked and setting Run close driver to false because of Unix.
Charlie Kindel před 5 roky
rodič
revize
2fe5e08f6b
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 2 2
      Terminal.Gui/Views/Menu.cs
  2. 1 1
      UICatalog/Scenario.cs

+ 2 - 2
Terminal.Gui/Views/Menu.cs

@@ -1225,9 +1225,9 @@ namespace Terminal.Gui {
 								menu.Dispose ();
 							}
 						} else if (me.Flags == MouseFlags.Button1Pressed || me.Flags == MouseFlags.Button1DoubleClicked || me.Flags == MouseFlags.Button1TripleClicked) {
-							if (IsMenuOpen) {
+							if (IsMenuOpen && !Menus [i].IsTopLevel) {
 								CloseAllMenus ();
-							} else {
+							} else if (!Menus [i].IsTopLevel) {
 								Activate (i);
 							}
 						} else if (selected != i && selected > -1 && (me.Flags == MouseFlags.ReportMousePosition ||

+ 1 - 1
UICatalog/Scenario.cs

@@ -198,7 +198,7 @@ namespace UICatalog {
 		public virtual void Run ()
 		{
 			// This method already performs a later automatic shutdown.
-			Application.Run (Top);
+			Application.Run (Top, false);
 		}
 
 		/// <summary>