Fixes #4172 Timeout revamp and remove continuous mouse #4173
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…(old implementation of WantContinuousButtonPressed)
…on firing twice immediately as mouse is pressed down.
|
Downloading logs, it appears the failure on macos here is in |
…znind-logarithmic-timeout
tig
added a commit
to tig/Terminal.Gui
that referenced
this pull request
Jul 7, 2025
|
@tznind - This breaks See
Compare this to v2_develop:
I have merged this into #4126, and it wasn't too challenging, but then I noticed this. |
|
Ok cool, I guess just need to wire that 'held down' effect into the event handler for IMouseHeldDown. Something like setting it to true at start and false at end. |
Should be fixed now in a938fc1 |
|
@tznind please change the unit test [Theory]
[InlineData ("v2win", typeof (ConsoleDriverFacade<WindowsConsole.InputRecord>))]
[InlineData ("v2net", typeof (ConsoleDriverFacade<ConsoleKeyInfo>))]
[InlineData ("FakeDriver", typeof (FakeDriver))]
[InlineData ("NetDriver", typeof (NetDriver))]
[InlineData ("WindowsDriver", typeof (WindowsDriver))]
[InlineData ("CursesDriver", typeof (CursesDriver))]
public void Run_T_Call_Init_ForceDriver_Should_Pick_Correct_Driver (string driverName, Type expectedType)
{
Assert.True (ConsoleDriver.RunningUnitTests);
var result = false;
Task.Run (() =>
{
while (!Application.Initialized)
{
Task.Delay (300).Wait ();
}
}).ContinueWith (
(t, _) =>
{
// no longer loading
Assert.True (Application.Initialized);
Application.Invoke (() =>
{
result = true;
Application.RequestStop ();
});
},
TaskScheduler.FromCurrentSynchronizationContext ());
Application.ForceDriver = driverName;
Application.Run<TestToplevel> ();
Assert.NotNull (Application.Driver);
Assert.Equal (expectedType, Application.Driver?.GetType ());
Assert.NotNull (Application.Top);
Assert.False (Application.Top!.Running);
Application.Top!.Dispose ();
Shutdown ();
Assert.True (result);
} |
|
Code still seems to fail in CI, maybe : |
|
Try this. It's needed to avoid that another driver is passing by using private readonly object _forceDriverLock = new ();
[Theory]
[InlineData ("v2win", typeof (ConsoleDriverFacade<WindowsConsole.InputRecord>))]
[InlineData ("v2net", typeof (ConsoleDriverFacade<ConsoleKeyInfo>))]
[InlineData ("FakeDriver", typeof (FakeDriver))]
[InlineData ("NetDriver", typeof (NetDriver))]
[InlineData ("WindowsDriver", typeof (WindowsDriver))]
[InlineData ("CursesDriver", typeof (CursesDriver))]
public void Run_T_Call_Init_ForceDriver_Should_Pick_Correct_Driver (string driverName, Type expectedType)
{
Assert.True (ConsoleDriver.RunningUnitTests);
var result = false;
lock (_forceDriverLock)
{
Task.Run (() =>
{
while (!Application.Initialized)
{
Task.Delay (300).Wait ();
}
})
.ContinueWith (
(t, _) =>
{
// no longer loading
Assert.True (Application.Initialized);
Application.Invoke (() =>
{
result = true;
Application.RequestStop ();
});
},
TaskScheduler.FromCurrentSynchronizationContext ());
}
Application.ForceDriver = driverName;
Application.Run<TestToplevel> ();
Assert.NotNull (Application.Driver);
Assert.Equal (expectedType, Application.Driver?.GetType ());
Assert.NotNull (Application.Top);
Assert.False (Application.Top!.Running);
Application.Top!.Dispose ();
Shutdown ();
Assert.True (result);
} |
|
Did you already seen these warnings on all projects?
|
|
I think the key might be this 28787e8 Without Idle anymore we apparently introduce possibility that even with Timespan.Zero the timeout doesn't show as immediately executing. |
|
Great. This latest change you made fix really it. It seems that if it's zero it may wait until the next timeout. Good catch. |
|
@tznind I just submitted another PR to this PR with some code cleanup and API doc improvements. |
Code cleanup and better API docs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is super set of #4172 and #4123 it adds also the smooth timeout class
Fixes
v2win/v2net-WantContinuousButtonPresseddoes not repeat. #4101Proposed Changes/Todos
Pull Request checklist:
CTRL-K-Dto automatically reformat your files before committing.dotnet testbefore commit///style comments)