ソースを参照

Merge pull request #97 from pmsanford/master

Handle case where there's no previous focus
Miguel de Icaza 7 年 前
コミット
8dd6ef8e9c
2 ファイル変更3 行追加1 行削除
  1. 2 0
      Terminal.Gui/Views/ListView.cs
  2. 1 1
      Terminal.Gui/Views/Menu.cs

+ 2 - 0
Terminal.Gui/Views/ListView.cs

@@ -180,6 +180,8 @@ namespace Terminal.Gui {
 			if (source == null)
 				throw new ArgumentNullException (nameof (source));
 			Source = MakeWrapper (source);
+			((ListWrapper) Source).Container = this;
+			((ListWrapper) Source).Driver = Driver;
 		}
 
 		bool allowsMarking;

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

@@ -382,7 +382,7 @@ namespace Terminal.Gui {
 			selected = -1;
 			SetNeedsDisplay ();
 			SuperView.Remove (openMenu);
-			previousFocused.SuperView.SetFocus (previousFocused);
+			previousFocused?.SuperView?.SetFocus (previousFocused);
 			openMenu = null;
 		}