Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 07:47:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gui-cs:v2_develop' into v2_develop

Browse Source
This commit is contained in:
Tig
2025-07-25 08:04:07 -06:00
committed by GitHub
parent e3049bcb37 807f1fdcc8
commit f30d5be27d
3 changed files with 77 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Terminal.Gui/App/MainLoopSyncContext.cs
View File

@@ -11,15 +11,22 @@ internal sealed class MainLoopSyncContext : SynchronizationContext
public override void Post (SendOrPostCallback d, object state)
{
// Queue the task
Application.MainLoop?.TimedEvents.Add (TimeSpan.Zero,
() =>
{
d (state);
if (ApplicationImpl.Instance.IsLegacy)
{
Application.MainLoop?.TimedEvents.Add (TimeSpan.Zero,
() =>
{
d (state);
return false;
}
);
Application.MainLoop?.Wakeup ();
return false;
}
);
Application.MainLoop?.Wakeup ();
}
else
{
ApplicationImpl.Instance.Invoke (() => { d (state); });
}
}
//_mainLoop.Driver.Wakeup ();

11
Terminal.Gui/ViewBase/View.cs
View File

@@ -245,12 +245,13 @@ public partial class View : IDisposable, ISupportInitializeNotification
}
}
if (ApplicationImpl.Instance.IsLegacy)
{
// TODO: Figure out how to move this out of here and just depend on LayoutNeeded in Mainloop
Layout (); // the EventLog in AllViewsTester fails to layout correctly if this is not here (convoluted Dim.Fill(Func)).
}
// Force a layout each time a View is initialized
// See: https://github.com/gui-cs/Terminal.Gui/issues/3951
// See: https://github.com/gui-cs/Terminal.Gui/issues/4204
Layout (); // the EventLog in AllViewsTester fails to layout correctly if this is not here (convoluted Dim.Fill(Func)).
// Complex layout scenarios (e.g. DimAuto and PosAlign) may require multiple layouts to be performed.
// Thus, we call SetNeedsLayout() to ensure that the layout is performed at least once.
SetNeedsLayout ();
Initialized?.Invoke (this, EventArgs.Empty);

82
Tests/UnitTests/Application/SynchronizatonContextTests.cs
View File

@@ -21,43 +21,73 @@ public class SyncrhonizationContextTests
Application.Shutdown ();
}
private object _lockPost = new ();
[Theory]
[InlineData (typeof (FakeDriver))]
[InlineData (typeof (NetDriver))]
[InlineData (typeof (WindowsDriver))]
[InlineData (typeof (CursesDriver))]
public void SynchronizationContext_Post (Type driverType)
[InlineData (typeof (ConsoleDriverFacade<WindowsConsole.InputRecord>), "v2win")]
[InlineData (typeof (ConsoleDriverFacade<ConsoleKeyInfo>), "v2net")]
public void SynchronizationContext_Post (Type driverType, string driverName = null)
{
ConsoleDriver.RunningUnitTests = true;
Application.Init (driverName: driverType.Name);
SynchronizationContext context = SynchronizationContext.Current;
lock (_lockPost)
{
ConsoleDriver.RunningUnitTests = true;
var success = false;
if (driverType.Name.Contains ("ConsoleDriverFacade"))
{
Application.Init (driverName: driverName);
}
else
{
Application.Init (driverName: driverType.Name);
}
Task.Run (
() =>
{
Thread.Sleep (500);
SynchronizationContext context = SynchronizationContext.Current;
// non blocking
context.Post (
delegate
{
success = true;
var success = false;
// then tell the application to quit
Application.Invoke (() => Application.RequestStop ());
},
null
);
Assert.False (success);
}
);
Task.Run (() =>
{
while (Application.Top is null || Application.Top is { Running: false })
{
Thread.Sleep (500);
}
// blocks here until the RequestStop is processed at the end of the test
Application.Run ().Dispose ();
Assert.True (success);
Application.Shutdown ();
// non blocking
context.Post (
delegate
{
success = true;
// then tell the application to quit
Application.Invoke (() => Application.RequestStop ());
},
null
);
if (Application.Top is { Running: true })
{
Assert.False (success);
}
}
);
// blocks here until the RequestStop is processed at the end of the test
Application.Run ().Dispose ();
Assert.True (success);
if (ApplicationImpl.Instance is ApplicationV2)
{
ApplicationImpl.Instance.Shutdown ();
}
else
{
Application.Shutdown ();
}
}
}
[Fact]