2
0
BDisp 5 жил өмнө
parent
commit
1cdf6d0587

+ 3 - 3
Terminal.Gui/Core/View.cs

@@ -777,6 +777,9 @@ namespace Terminal.Gui {
 					view.SetNeedsDisplay ();
 					view.SetNeedsDisplay ();
 			}
 			}
 			OnRemoved (view);
 			OnRemoved (view);
+			if (focused == view) {
+				focused = null;
+			}
 		}
 		}
 
 
 		void PerformActionForSubview (View subview, Action<View> action)
 		void PerformActionForSubview (View subview, Action<View> action)
@@ -1911,9 +1914,6 @@ namespace Terminal.Gui {
 				Remove (subview);
 				Remove (subview);
 				subview.Dispose ();
 				subview.Dispose ();
 			}
 			}
-			if (Application.Top.focused == this) {
-				Application.Top.focused = null;
-			}
 			base.Dispose (disposing);
 			base.Dispose (disposing);
 		}
 		}
 
 

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

@@ -1019,11 +1019,13 @@ namespace Terminal.Gui {
 				LastFocused = lastFocused;
 				LastFocused = lastFocused;
 				lastFocused = null;
 				lastFocused = null;
 				if (LastFocused != null) {
 				if (LastFocused != null) {
+					CanFocus = false;
 					if (!reopen) {
 					if (!reopen) {
 						selected = -1;
 						selected = -1;
 					}
 					}
 					LastFocused.SuperView?.SetFocus (LastFocused);
 					LastFocused.SuperView?.SetFocus (LastFocused);
 				} else {
 				} else {
+					CanFocus = true;
 					SuperView.SetFocus (this);
 					SuperView.SetFocus (this);
 					PositionCursor ();
 					PositionCursor ();
 				}
 				}