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

Commit messages menu: Fix (sometimes) broken display #7369

Merged
merged 1 commit into from
Oct 31, 2019

Conversation

pmiossec
Copy link
Member

@pmiossec pmiossec commented Oct 28, 2019

Fixes #5115

Proposed changes

When building the commit message history to display in the dropdown menu,
and the commit message is shorter than the maximum length allowed
but is a multi line commit message,
then the display is broken for all the menus items.

=> add a check that the commit message is multi line and must be shorten.

  • increase the length of text in the menu items because 50 char is too short

Screenshots

Before

See the first menu item which is display onto 2 lines and so increase the height of all menu items:

image

After

image

Test methodology

  • Manual

Test environment(s)

  • Git Extensions 3.3.0
  • Build bffb060100bbe3ab838b00d2a37810cb34e1638a (Dirty)
  • Git 2.23.0.windows.1
  • Microsoft Windows NT 10.0.17134.0
  • .NET Framework 4.8.4042.0
  • DPI 192dpi (200% scaling)

@ghost ghost assigned pmiossec Oct 28, 2019
@codecov
Copy link

codecov bot commented Oct 28, 2019

Codecov Report

Merging #7369 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #7369      +/-   ##
==========================================
- Coverage   48.45%   48.45%   -0.01%     
==========================================
  Files         752      752              
  Lines       55182    55182              
  Branches     7175     7175              
==========================================
- Hits        26740    26737       -3     
- Misses      27014    27038      +24     
+ Partials     1428     1407      -21
Flag Coverage Δ
#production 37.45% <0%> (-0.02%) ⬇️
#tests 97.71% <ø> (+0.01%) ⬆️

GitUI/CommandsDialogs/FormCommit.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/FormCommit.cs Outdated Show resolved Hide resolved
@RussKie
Copy link
Member

RussKie commented Oct 30, 2019

I think this will fix #5115

@RussKie
Copy link
Member

RussKie commented Oct 30, 2019

I'd like to see some tests as well please

@RussKie RussKie added the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Oct 30, 2019
When building the commit message history to display in the dropdown menu,
and the commit message is shorter than the maximum length allowed
but is a multi line commit message,
then the display is broken for all the menus items.

=> add a check that the commit message is multi line and must be shorten.

+ increase the length of text in the menu items because 50 char is too short
@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Oct 30, 2019
@pmiossec
Copy link
Member Author

done.

@RussKie RussKie merged commit e74ec49 into gitextensions:master Oct 31, 2019
@ghost ghost added this to the 3.3 milestone Oct 31, 2019
@pmiossec pmiossec deleted the fix_two_lines_menu_items branch October 31, 2019 09:09
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.

Commit dialog inconsistently renders its dropdowns
4 participants