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

Enable Rounded Corners for WinMerge Menu on Windows 11 #2364

Merged
merged 3 commits into from
Jun 28, 2024

Conversation

sdottaka
Copy link
Member

@sdottaka sdottaka commented Jun 27, 2024

This PR fixes the issue where WinMerge menus do not have rounded corners on Windows 11 by removing the owner draw.
However, there is still an issue with radio items not being drawn properly, which has not been resolved.

WinMerge version 2.16.40
image

WinMerge version 2.16.42 (this PR)
image

@sdottaka sdottaka added this to the v2.16.42 milestone Jun 28, 2024
@sdottaka sdottaka changed the title WIP Enable Rounded Corners for WinMerge Menu on Windows 11 Jun 28, 2024
@sdottaka sdottaka marked this pull request as ready for review June 28, 2024 13:06
@sdottaka sdottaka merged commit eae750d into master Jun 28, 2024
2 of 3 checks passed
@sdottaka sdottaka deleted the remove-owner-draw-menu branch June 28, 2024 13:10
@MagicAndre1981
Copy link

Can you please add an option to disable this? I don't like rounded corners

@sdottaka
Copy link
Member Author

Could you create an issue about that? We don't have plans to make it switchable at the moment, but if many people dislike it, we may change it back.

By the way, can you articulate how you dislike rounded corners?

For example, in some applications, rounding the corners can cut off text, or in the case of images, the images can be cut off. Or it may cause unnecessary CPU load.

@mdonatas-trafi
Copy link

Rounded corners in menus is OK, but tabs and text backgrounds (such as Location pane) look very weird.

I cast my vote to revert this (except menus).

Looking at how to build my own executable with this reverted for the time being 😅

@sdottaka
Copy link
Member Author

sdottaka commented Aug 2, 2024

Thank you for your feedback.

I understand that you find the rounded corners in menus acceptable but feel that tabs and text backgrounds (such as the Location pane) look strange. While I don't intend to make major changes at this point, I'm curious about why you feel this way.

Do you think the issue is the rounded corners themselves, or could it be that the corner radius is too large or that the small spaces and shadows introduced with the rounded design look off?

Additionally, do you find the rounded corners on other platforms like GitHub or many other websites bothersome? If not, could it be more of a balance issue rather than the rounded corners themselves?

Also, I'd like to share that I am considering moving the tabs to the top of the title bar, similar to how web browser applications handle them. While this is a significant amount of work and I can't say when it will be implemented, it might help reduce the sense of discomfort.

@mdonatas-trafi
Copy link

@sdottaka first of all, thanks for all the work that you do, while I was bisecting to see where there changes affecting each "rounding" were I was surprised by how much of the code had to change for that.

The main reason for such a reaction was discontinuity of the UI. If you look at this, everything is cramped, toolbar buttons have no margins and probably only ~2px padding - and I like it! This means there is more space for the important stuff - the diff.
image

In the updated UI we loose 1 row of diff for no good reason (in my biased opinion).
image

1 - this feels artificially shrunken.. as if "the container is clearly WAY too small". I understand that amount of text visible is the same on both cases but the previous version feels roomier.
2 - This irks me because it represents visible rows and I see whole rows and the diffs view-port is not rounded and thus why should it's representation be? It also has discontinuity in that the rectangle representing full document length doesn't have rounded corners (please don't.. better revert the rounding of this particular rectangle)
3 - Way too much attention grabbing. Again, the main thing why this program was opened is a diff. No need to bold it.

p.s. It was a bit sad that in the code changing RR_RADIUS didn't just change the radius of the corners but actually changed the dimensions of the rectangle itself.. this ruined my hopes of an easy fix to get the rectangles back :)

@sdottaka
Copy link
Member Author

sdottaka commented Aug 4, 2024

Thanks for your feedback.

I'm also a little concerned about the narrower display area for the diffs. For this reason, I'd like to move the tabs to the title bar like other web browser applications.

  1. I'm thinking of increasing the margins a bit.
  2. I rounded the corners because I wanted it to look like it was in a spotlight. I probably won't round the white areas.
  3. Some of the text was hard to see, probably because of the background color, so I tried making it bold and it looked better to me. The main focus is certainly the diff, but shouldn't you focus on what the diff is in the first place?

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.

3 participants