Skip to content

feat: branch diff adjust icons for file status #12117

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

Merged

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Dec 30, 2024

Proposed changes

Modify the icons for the file status list when comparing branches with a common base, the info with feedback for where the files are changed: Unequal/B (second), A (first), Same (both changes the same).

Color is added to give some feedback of the change in addition to the (pixel) character: B (blue-violet), A (yellow) and same (green) (unequal was red already).
Some minor anti-aliasing too.

Also prepare the icons for dark mode.
Edit: also updated added/removed/copied/renamed (just modified first) (all submodule related are not changed, as before).

Related to #12111
This could be handled in that PR too, but the intention is that that PR in itself should have a minimal of changes to the light mode.

PHYs attribute has been removed with TweakPng

Screenshots

Before

image
image
image
image

Dark mode is not used, but the pixel char is hard to see with dark text
image
image

After

image
image
image
image

image
image
image

image
image
image
image

Slightly darker background than in the app
image
image
image

Test methodology

Visual

Test environment(s)

Win11

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.

Modify the icons for the file status list when comparing branches
with a common base, the info with feedback for where the files
are changed: Unequal/B (second), A (first), Same (both changes the same).

Color is added to give some feedback of the change in addition to the
(pixel) character: B (blue-violet), A (yellow) and same (green)
(unequal was red already).

Also prepare the icons for dark mode.

Note that only Modified is changed, not added/removed/copied/renamed,
pending feedback (all submodule related are not changed, as before).
@mstv
Copy link
Member

mstv commented Dec 30, 2024

This seems to be an acceptable compromise.
But no anti-aliasing, please! I.e. only one color for each character ('A' and 'B' need to be changed).
The pHYs section needs to removed, e.g. using https://entropymine.com/jason/tweakpng. I could not find the other PNG optimizer tool.

@gerhardol
Copy link
Member Author

This seems to be an acceptable compromise. But no anti-aliasing, please! I.e. only one color for each character ('A' and 'B' need to be changed). The pHYs section needs to removed, e.g. using https://entropymine.com/jason/tweakpng. I could not find the other PNG optimizer tool.

PHYs are removed already - will need to be removed again after updates...
The icons look slightly better with anti aliasing (may not be more readable) I can remove anti aliasing, will be easier to implement to the other icons then...

Modify the icons for the file status list when comparing branches
with a common base, the info with feedback for where the files
are changed: Unequal/B (second), A (first), Same (both changes the same).

Color is added to give some feedback of the change in addition to the
(pixel) character: B (blue-violet), A (yellow) and same (green)
(unequal was red already).

Also prepare the icons for dark mode.
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.

Perhaps, use some yellowish color for the "AA" in "renamed" icons.

@gerhardol
Copy link
Member Author

gerhardol commented Jan 1, 2025

The normal icon is OK, just branch compare that are kept black
image

Notice the incorrect length for the marking, in #12116 (as the tooltip is removed in that PR too, it is hard to see the original file name)
image
image

Wrong icon for renamed (also in master)
image

@gerhardol gerhardol mentioned this pull request Jan 2, 2025
@gerhardol gerhardol merged commit 57cee63 into gitextensions:master Jan 3, 2025
4 checks passed
@gerhardol gerhardol deleted the feature/dark-mode-status-icons branch January 3, 2025 22:54
@mstv mstv added this to the v5.2 milestone Jan 8, 2025
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.

2 participants