mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 16:59:35 +01:00
* Remove continous press code from Application * WIP prototype code to handle continuous press as subcomponent of View * Prototype with Button * Implement CWP * Move to seperate classes and prevent double entry to Start * Fix repeat clicking when moving mouse by removing phantom click code (old implementation of WantContinuousButtonPressed) * Remove initial tick because it results in double activation e.g. button firing twice immediately as mouse is pressed down. * Refactor DatePicker lamdas * WIP investigate subcomponents instead of statics * Add IMouseGrabHandler to IApplication * Make mouse grabbing non static activity * Make MouseHeldDown suppress when null fields e.g. app not initialized in tests * Update test and remove dependency on Application * Fix other mouse click and hold tests * Code cleanup * Update class diagram * Fix bad xml doc references * Fix timed events not getting passed through in v2 applications * Make timed events nullable for tests that dont create an Application * Remove strange blocking test * WIP remove all idles and replace with zero timeouts * Fix build of tests * Fix unit tests * Add wakeup call back in * Comment out incredibly complicated test and fix others * Fix test * test fix * Make Post execute immediately if already on UI thread * Re enable test and simplify Invoke to just execute if in UI thread (up front) * Remove xml doc references to idles * Remove more references to idles * Make Screen initialization threadsafe * Add more exciting timeouts * WIP add tests * fix log * fix test * make continuous key press use smoth acceleration * Rename _lock to _lockScreen * Remove section on idles, they are not a thing anymore - and they kinda never were. * Add nullable enable * Add xml comment * Fix namings and cleanup code * xmldoc fix * Rename LockAndRunTimers to just RunTimers * Rename AddTimeout and RemoveTimeout (and event) to just Add/Remove * Update description of MainLoop * Commented out Run_T_Call_Init_ForceDriver_Should_Pick_Correct_Driver * Again? Commented out Run_T_Call_Init_ForceDriver_Should_Pick_Correct_Driver * Revert Commented out Run_T_Call_Init_ForceDriver_Should_Pick_Correct_Driver * When mouse is released from MouseHeldDown reset host MouseState * Fix namespaces in class diagram * Apply @BDisp suggested fix * Fix class diagrams * Add lock * Make TimeSpan.Zero definetly run * Fix duplicate entry in package props --------- Co-authored-by: Tig <tig@users.noreply.github.com>
This commit is contained in:
@@ -307,8 +307,7 @@ public class ApplicationTests
|
||||
|
||||
// Public Properties
|
||||
Assert.Null (Application.Top);
|
||||
Assert.Null (Application.MouseGrabView);
|
||||
Assert.Null (Application.WantContinuousButtonPressedView);
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView);
|
||||
|
||||
// Don't check Application.ForceDriver
|
||||
// Assert.Empty (Application.ForceDriver);
|
||||
@@ -569,8 +568,7 @@ public class ApplicationTests
|
||||
Assert.Null (Application.Top);
|
||||
RunState rs = Application.Begin (new ());
|
||||
Assert.Equal (Application.Top, rs.Toplevel);
|
||||
Assert.Null (Application.MouseGrabView); // public
|
||||
Assert.Null (Application.WantContinuousButtonPressedView); // public
|
||||
Assert.Null (Application.MouseGrabHandler.MouseGrabView); // public
|
||||
Application.Top!.Dispose ();
|
||||
}
|
||||
|
||||
@@ -952,7 +950,7 @@ public class ApplicationTests
|
||||
Assert.Equal (new (0, 0), w.Frame.Location);
|
||||
|
||||
Application.RaiseMouseEvent (new () { Flags = MouseFlags.Button1Pressed });
|
||||
Assert.Equal (w.Border, Application.MouseGrabView);
|
||||
Assert.Equal (w.Border, Application.MouseGrabHandler.MouseGrabView);
|
||||
Assert.Equal (new (0, 0), w.Frame.Location);
|
||||
|
||||
// Move down and to the right.
|
||||
@@ -1116,6 +1114,8 @@ public class ApplicationTests
|
||||
|
||||
private class TestToplevel : Toplevel { }
|
||||
|
||||
private readonly object _forceDriverLock = new ();
|
||||
|
||||
[Theory]
|
||||
[InlineData ("v2win", typeof (ConsoleDriverFacade<WindowsConsole.InputRecord>))]
|
||||
[InlineData ("v2net", typeof (ConsoleDriverFacade<ConsoleKeyInfo>))]
|
||||
@@ -1129,20 +1129,29 @@ public class ApplicationTests
|
||||
|
||||
var result = false;
|
||||
|
||||
Task.Run (() =>
|
||||
{
|
||||
Task.Delay (300).Wait ();
|
||||
}).ContinueWith (
|
||||
(t, _) =>
|
||||
lock (_forceDriverLock)
|
||||
{
|
||||
Task.Run (() =>
|
||||
{
|
||||
while (!Application.Initialized)
|
||||
{
|
||||
Task.Delay (300).Wait ();
|
||||
}
|
||||
})
|
||||
.ContinueWith (
|
||||
(t, _) =>
|
||||
{
|
||||
// no longer loading
|
||||
Assert.True (Application.Initialized);
|
||||
|
||||
Application.Invoke (() =>
|
||||
{
|
||||
// no longer loading
|
||||
Application.Invoke (() =>
|
||||
{
|
||||
result = true;
|
||||
Application.RequestStop ();
|
||||
});
|
||||
},
|
||||
TaskScheduler.FromCurrentSynchronizationContext ());
|
||||
result = true;
|
||||
Application.RequestStop ();
|
||||
});
|
||||
},
|
||||
TaskScheduler.FromCurrentSynchronizationContext ());
|
||||
}
|
||||
|
||||
Application.ForceDriver = driverName;
|
||||
Application.Run<TestToplevel> ();
|
||||
|
||||
Reference in New Issue
Block a user