Răsfoiți Sursa

Requested changes made.

BDisp 5 ani în urmă
părinte
comite
afae8b8f85

+ 5 - 4
Terminal.Gui/ConsoleDrivers/WindowsDriver.cs

@@ -695,8 +695,9 @@ namespace Terminal.Gui {
 						keyUpHandler (new KeyEvent (map, keyModifiers));
 					}
 				}
-				if (!inputEvent.KeyEvent.bKeyDown)
+				if (!inputEvent.KeyEvent.bKeyDown) {
 					keyModifiers = null;
+				}
 				break;
 
 			case WindowsConsole.EventType.Mouse:
@@ -879,7 +880,7 @@ namespace Terminal.Gui {
 			};
 		}
 
-		private async Task ProcessButtonDoubleClickedAsync ()
+		async Task ProcessButtonDoubleClickedAsync ()
 		{
 			await Task.Delay (200);
 			IsButtonDoubleClicked = false;
@@ -896,11 +897,11 @@ namespace Terminal.Gui {
 				};
 
 				var view = Application.wantContinuousButtonPressedView;
-				if (view == null)
+				if (view == null) {
 					break;
+				}
 				if (IsButtonPressed && (mouseFlag & MouseFlags.ReportMousePosition) == 0) {
 					mouseHandler (me);
-					//mainLoop.Driver.Wakeup ();
 				}
 			}
 		}

+ 2 - 1
Terminal.Gui/Core/Application.cs

@@ -351,8 +351,9 @@ namespace Terminal.Gui {
 					OfY = me.Y - newxy.Y,
 					View = view
 				};
-				if (OutsideFrame (new Point (nme.X, nme.Y), mouseGrabView.Frame))
+				if (OutsideFrame (new Point (nme.X, nme.Y), mouseGrabView.Frame)) {
 					lastMouseOwnerView?.OnMouseLeave (me);
+				}
 				if (mouseGrabView != null) {
 					mouseGrabView.OnMouseEvent (nme);
 					return;

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

@@ -810,10 +810,8 @@ namespace Terminal.Gui {
 					if (!reopen)
 						selected = -1;
 					LastFocused.SuperView?.SetFocus (LastFocused);
-					IsMenuOpen = false;
 				} else {
 					SuperView.SetFocus (this);
-					IsMenuOpen = false;
 					PositionCursor ();
 				}
 				IsMenuOpen = false;