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 toolbar order (revisited) #8807

Merged
merged 1 commit into from Jan 31, 2021

Conversation

RussKie
Copy link
Member

@RussKie RussKie commented Jan 30, 2021

Proposed changes

The designer keeps on wrecking havoc with toolbars - i.e. the order appears to be semi random and not expected.
Revisit the toolbar layout workaround, and add assertions to validate the outcome.

Related #8719


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

@ghost ghost assigned RussKie Jan 30, 2021
@RussKie RussKie force-pushed the fix_toolbar_order2 branch 2 times, most recently from f841949 to 9278fc2 Compare January 30, 2021 13:49
@codecov
Copy link

codecov bot commented Jan 30, 2021

Codecov Report

Merging #8807 (6b7c2b9) into master (53e88d1) will increase coverage by 0.35%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #8807      +/-   ##
==========================================
+ Coverage   55.66%   56.01%   +0.35%     
==========================================
  Files         894      905      +11     
  Lines       64855    65315     +460     
  Branches    11870    11885      +15     
==========================================
+ Hits        36103    36589     +486     
+ Misses      25809    25795      -14     
+ Partials     2943     2931      -12     
Flag Coverage Δ
production 43.18% <100.00%> (+0.05%) ⬆️
tests 94.47% <ø> (+0.16%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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.

+1

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.

👍 Should work. Two nits in the assertions.

GitUI/CommandsDialogs/FormBrowse.cs Outdated Show resolved Hide resolved
The designer keeps on wrecking havoc with toolbars. Revisit the toolbar
layout workaround, and add assertions to validate the outcome.
@RussKie RussKie merged commit 2e09cf1 into gitextensions:master Jan 31, 2021
@ghost ghost added this to the 3.5 milestone Jan 31, 2021
@RussKie RussKie deleted the fix_toolbar_order2 branch January 31, 2021 07:16
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.

None yet

3 participants