Skip to content
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.

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

Replace ShortcutKeys Ctrl+F with Hotkeys #9931

Merged
merged 4 commits into from Apr 21, 2022

Conversation

mstv
Copy link
Member

@mstv mstv commented Apr 2, 2022

Fixes #9921

Proposed changes

Screenshots

Before

grafik

After

grafik

Test methodology

  • manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build 23e8cf2
  • Git 2.35.1.windows.1
  • Microsoft Windows NT 10.0.19044.0
  • .NET 6.0.3
  • DPI 96dpi (no scaling)

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

@mstv mstv self-assigned this Apr 2, 2022
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest a name change
There are some assignments of ShortcutKeys still, also RevDiff and Browse...

GitUI/CommandsDialogs/RevisionFileTreeControl.cs Outdated Show resolved Hide resolved
mstv added 2 commits April 3, 2022 21:07
Review comment: Rename to Command.FindFile
No default hotkey for RevisionDiffControl.Command.FindFile
@mstv mstv requested a review from RussKie April 6, 2022 19:29
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

We just need to add auto-focus for the File Tree control:

diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
index 9f10dddd3..726e10e26 100644
--- a/GitUI/CommandsDialogs/FormBrowse.cs
+++ b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -1549,6 +1549,10 @@ private void CommitInfoTabControl_SelectedIndexChanged(object sender, EventArgs
                 // workaround to avoid focusing the "filter files" combobox
                 revisionDiff.SwitchFocus(alreadyContainedFocus: false);
             }
+            else if (CommitInfoTabControl.SelectedTab == TreeTabPage)
+            {
+                fileTree.SwitchFocus(alreadyContainedFocus: false);
+            }
         }

@RussKie RussKie self-requested a review April 19, 2022 05:34
@RussKie RussKie added the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Apr 19, 2022
@mstv
Copy link
Member Author

mstv commented Apr 20, 2022

We just need to add auto-focus for the File Tree control

👍

Ready for squash-merge.

@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Apr 20, 2022
@RussKie
Copy link
Member

RussKie commented Apr 20, 2022 via email

@mstv mstv merged commit 62fc551 into gitextensions:master Apr 21, 2022
@ghost ghost added this to the vNext milestone Apr 21, 2022
@mstv mstv deleted the fix/9921_find_hotkeys branch April 21, 2022 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FileTree hotkey to search files no longer works
3 participants