Skip to content

Fixes #3424. v1 - Views should not force focus if they are not selected. #3427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tig merged 2 commits into from
Apr 27, 2024
Merged

Fixes #3424. v1 - Views should not force focus if they are not selected. #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba1624
Fixes #3424. v1 - Views should not force focus if they are not selected.
BDisp Apr 21, 2024
9646c10
Fix a conflict with this unit test and the TestVKPacket unit test.
BDisp Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Terminal.Gui/Views/ComboBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ private void Reset (bool keepSearchText = false)
listview.SetSource (searchset);
listview.Height = CalculatetHeight ();

if (Subviews.Count > 0) {
if (HasFocus && Subviews.Count > 0) {
search.SetFocus ();
}
}
Expand Down
4 changes: 4 additions & 0 deletions Terminal.Gui/Windows/Wizard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,10 @@ public bool GoToStep (WizardStep newStep)
var oldStep = currentStep;
currentStep = newStep;

if (currentStep is null) {
return false;
}

UpdateButtonsAndTitle ();

// Set focus to the nav buttons
Expand Down
4 changes: 4 additions & 0 deletions UnitTests/Views/ViewTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,10 @@ public void KeyPress_Handled_To_True_Prevents_Changes ()

Application.Run ();

// Ensures cleaning any keystroke.
// This was conflicting with the TestVKPacket unit test
Console.MockKeyPresses.Clear ();

// Shutdown must be called to safely clean up Application if Init has been called
Application.Shutdown ();
}
Expand Down