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

Fix 7364: "Fetch and Prune All" confirmation modal has weird focus behavior #7365

Merged
1 commit merged into from
Oct 29, 2019

Conversation

lhiginbotham
Copy link
Contributor

  • use the proper window owner when showing the "fetch and prune all" confirmation dialog (to fix focus issues)

Fixes #7364

Proposed changes

  • use the correct owner window to fix focus issues

Screenshots

N/A

Test methodology

  • built and interactively tested the fix

Test environment(s)

  • Windows 10

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

…havior

	- use the proper window owner when showing the "fetch and prune all" confirmation dialog (to fix focus issues)
@ghost ghost assigned lhiginbotham Oct 27, 2019
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

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

Thank you for tackling this.
Though I am afraid that this fix must be applied to the very many other occurrences of MessageBox.Show(this, ...) in GE.
Rant: "xyz" + null gives "xyz". Where's the automagic of C# and .net here?
There's another pending PR #7321 which adapts all the GE code - danger of merge conflicts.

@codecov
Copy link

codecov bot commented Oct 27, 2019

Codecov Report

Merging #7365 into master will increase coverage by 0.12%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #7365      +/-   ##
==========================================
+ Coverage   48.34%   48.46%   +0.12%     
==========================================
  Files         752      752              
  Lines       55180    55182       +2     
  Branches     7175     7175              
==========================================
+ Hits        26677    26746      +69     
+ Misses      27090    27015      -75     
- Partials     1413     1421       +8
Flag Coverage Δ
#production 37.47% <0%> (+0.15%) ⬆️
#tests 97.71% <ø> (ø) ⬆️

@RussKie
Copy link
Member

RussKie commented Oct 28, 2019

Though I am afraid that this fix must be applied to the very many other occurrences of MessageBox.Show(this, ...) in GE.

I am not so sure, we need to inspect all of them and go from there.
In this particular case the containing method has owner passed in.

@lhiginbotham
Copy link
Contributor Author

@mstv @RussKie

I think in principle this can go in since it fixes a specific issue that has high visibility. I hit this issue so frequently and am itching to kill it 😄 We can open a second issue/research task to investigate all popup dialogs for such focus issues. There is no guarantee that these other dialogs would have similar issues, however, as I think this is more of an edge case.

@mstv
Copy link
Member

mstv commented Oct 29, 2019

@msftbot merge in 8 hours

@ghost
Copy link

ghost commented Oct 29, 2019

Hello @mstv!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Tue, 29 Oct 2019 13:48:59 GMT, which is in 8 hours

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ghost ghost added the status: auto merge label Oct 29, 2019
@ghost ghost merged commit 9d8c772 into gitextensions:master Oct 29, 2019
@gerhardol gerhardol mentioned this pull request Nov 9, 2019
@RussKie RussKie added this to the 3.3 milestone Nov 16, 2019
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Fetch and Prune All" confirmation modal has weird focus behavior
3 participants