mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 16:59:35 +01:00
Rename IApplication.Current to TopRunnable
Co-authored-by: tig <585482+tig@users.noreply.github.com>
This commit is contained in:
@@ -1098,7 +1098,7 @@ t
|
||||
Assert.Equal (new (5, 1), label.TextFormatter.ConstrainToSize);
|
||||
Assert.Equal (["Label"], label.TextFormatter.GetLines ());
|
||||
Assert.Equal (new (0, 0, 10, 4), win.Frame);
|
||||
Assert.Equal (new (0, 0, 10, 4), Application.Current.Frame);
|
||||
Assert.Equal (new (0, 0, 10, 4), Application.TopRunnable.Frame);
|
||||
|
||||
var expected = @"
|
||||
┌────────┐
|
||||
@@ -1157,7 +1157,7 @@ t
|
||||
Assert.Equal (new (5, 1), label.TextFormatter.ConstrainToSize);
|
||||
Assert.Equal (["Label"], label.TextFormatter.GetLines ());
|
||||
Assert.Equal (new (0, 0, 10, 4), win.Frame);
|
||||
Assert.Equal (new (0, 0, 10, 4), Application.Current.Frame);
|
||||
Assert.Equal (new (0, 0, 10, 4), Application.TopRunnable.Frame);
|
||||
|
||||
var expected = @"
|
||||
┌────────┐
|
||||
@@ -1230,10 +1230,10 @@ t
|
||||
CanFocus = true
|
||||
};
|
||||
|
||||
Application.Current = new ();
|
||||
Application.Current.Add (otherView, label, nextView);
|
||||
Application.TopRunnable = new ();
|
||||
Application.TopRunnable.Add (otherView, label, nextView);
|
||||
|
||||
Application.Current.SetFocus ();
|
||||
Application.TopRunnable.SetFocus ();
|
||||
Assert.True (otherView.HasFocus);
|
||||
|
||||
Assert.True (Application.RaiseKeyDownEvent (label.HotKey));
|
||||
@@ -1241,7 +1241,7 @@ t
|
||||
Assert.False (label.HasFocus);
|
||||
Assert.True (nextView.HasFocus);
|
||||
|
||||
Application.Current.Dispose ();
|
||||
Application.TopRunnable.Dispose ();
|
||||
Application.ResetState ();
|
||||
}
|
||||
|
||||
@@ -1251,18 +1251,18 @@ t
|
||||
View otherView = new () { X = 0, Y = 0, Width = 1, Height = 1, Id = "otherView", CanFocus = true };
|
||||
Label label = new () { X = 0, Y = 1, Text = "_label" };
|
||||
View nextView = new () { X = Pos.Right (label), Y = Pos.Top (label), Width = 1, Height = 1, Id = "nextView", CanFocus = true };
|
||||
Application.Current = new ();
|
||||
Application.Current.Add (otherView, label, nextView);
|
||||
Application.Current.Layout ();
|
||||
Application.TopRunnable = new ();
|
||||
Application.TopRunnable.Add (otherView, label, nextView);
|
||||
Application.TopRunnable.Layout ();
|
||||
|
||||
Application.Current.SetFocus ();
|
||||
Application.TopRunnable.SetFocus ();
|
||||
|
||||
// click on label
|
||||
Application.RaiseMouseEvent (new () { ScreenPosition = label.Frame.Location, Flags = MouseFlags.Button1Clicked });
|
||||
Assert.False (label.HasFocus);
|
||||
Assert.True (nextView.HasFocus);
|
||||
|
||||
Application.Current.Dispose ();
|
||||
Application.TopRunnable.Dispose ();
|
||||
Application.ResetState ();
|
||||
}
|
||||
|
||||
@@ -1281,8 +1281,8 @@ t
|
||||
CanFocus = true
|
||||
};
|
||||
|
||||
Application.Current = new ();
|
||||
Application.Current.Add (label, view);
|
||||
Application.TopRunnable = new ();
|
||||
Application.TopRunnable.Add (label, view);
|
||||
|
||||
view.SetFocus ();
|
||||
Assert.True (label.CanFocus);
|
||||
@@ -1295,7 +1295,7 @@ t
|
||||
Assert.True (label.HasFocus);
|
||||
Assert.False (view.HasFocus);
|
||||
|
||||
Application.Current.Dispose ();
|
||||
Application.TopRunnable.Dispose ();
|
||||
Application.ResetState ();
|
||||
}
|
||||
|
||||
@@ -1320,14 +1320,14 @@ t
|
||||
CanFocus = true
|
||||
};
|
||||
|
||||
Application.Current = new ()
|
||||
Application.TopRunnable = new ()
|
||||
{
|
||||
Width = 10,
|
||||
Height = 10
|
||||
};
|
||||
Application.Current.Add (label, otherView);
|
||||
Application.Current.SetFocus ();
|
||||
Application.Current.Layout ();
|
||||
Application.TopRunnable.Add (label, otherView);
|
||||
Application.TopRunnable.SetFocus ();
|
||||
Application.TopRunnable.Layout ();
|
||||
|
||||
Assert.True (label.CanFocus);
|
||||
Assert.True (label.HasFocus);
|
||||
@@ -1347,7 +1347,7 @@ t
|
||||
Assert.False (label.HasFocus);
|
||||
Assert.True (otherView.HasFocus);
|
||||
|
||||
Application.Current.Dispose ();
|
||||
Application.TopRunnable.Dispose ();
|
||||
Application.ResetState ();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user