Skip to content

Conversation

gerhardol
Copy link
Member

Preparation for #12111
Simplify review of the theme update.
This PR does not change behavior for the invariant theme.
There may be tweaks required to the theme handling in #12111 when that is actively reviewed, that review should be based on this (and similar) PRs.
Will likely be merged together with similar preparing PRs.

Proposed changes

Prepare for theming by adopting hardcoded colors to theme colors.

Some colors set in Designer updated in the form code files.
Requested in the theme PR, make it harder to review this PR.
#12111 (comment)

Test methodology

Review

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.

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 this be merged after v5.2. Or do we take the risk of a quick v5.2.1?

@RussKie
Copy link
Member

RussKie commented Jan 4, 2025

Should this be merged after v5.2. Or do we take the risk of a quick v5.2.1?

Do we have anything for a .1 release?

{ 'e', ("edit", new HighlightColor(Color.DarkGray.AdaptTextColor(), bold: true, italic: false), Array.Empty<string>()) },
{ 's', ("squash", new HighlightColor(Color.DarkBlue.AdaptTextColor(), bold: true, italic: false), Array.Empty<string>()) },
{ 'f', ("fixup", new HighlightColor(Color.LightCoral.AdaptTextColor(), bold: true, italic: false), new[] { "-C", "-c" }) },
{ 'x', ("exec", new HighlightColor(SystemColors.GrayText, bold: true, italic: false), Array.Empty<string>()) },
Copy link
Member Author

Choose a reason for hiding this comment

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

Note: This changes the color very slightly for the default theme.

@mstv
Copy link
Member

mstv commented Jan 4, 2025

Should this be merged after v5.2. Or do we take the risk of a quick v5.2.1?

Do we have anything for a .1 release?

I meant we should release a v5.2 with the bug fixes #12122 & #12129 and, optionally, with the low-risk feature #12023 (used for several months; and we have a fallback: the much slower ConEmu).
Most of Gerhard's refactoring PRs are pretty safe for merging before v5.2.
But this PR changes a lot and does not work well for FormCommit yet. So, there would be a risk that we would quickly need to release 5.2.1 if it causes more side-effects.

I would appreciate a soon release of v5.2. Then we could switch to .NET 9 and merge the fresh features (theming, tree view) and let them mature and be extended.

@RussKie
Copy link
Member

RussKie commented Jan 4, 2025

I'm away until the end of Jan and only have a mac, but I can try to muster a release.
You're welcome to give it a go too, and I'll give a helping hand, if required.

@gerhardol
Copy link
Member Author

Should this be merged after v5.2. Or do we take the risk of a quick v5.2.1?

Do we have anything for a .1 release?

I believe a 5.2 should be done soon, many nice corrections by mstv lately.
Release from master (I could consider #12116 too)

The changes I have in non draft for themeing should all have no effect on the default theme (I hope I have described all, forgot to mention src/app/GitUI/Editor/RebaseTodoHighlightingStrategy.cs)
This is the big one and also if mstv had not seen a problem, I would not merge it before a 5.2

I would like to merge the preparing PRs together so the actual changes for the theme are minimized and discussions can be on actual issues.

@mstv mstv changed the title fix: Adopt hardcoded colors fix: Adapt hardcoded colors Jan 5, 2025
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.

I have not noticed side-effects (without #12131) in one day usage (of straight-forward dev usage).

Prepare for theming by adapting hardcoded colors to theme colors.

Some colors set in Designer updated in the forms.
@gerhardol gerhardol force-pushed the feature/adapt-hardcoded-colors branch from a45938e to 2184655 Compare January 10, 2025 21:50
@mstv

This comment was marked as outdated.

@gerhardol gerhardol merged commit 4492da1 into gitextensions:master Jan 10, 2025
4 checks passed
@gerhardol gerhardol deleted the feature/adapt-hardcoded-colors branch January 10, 2025 23:01
@mstv mstv added this to the v5.3 milestone Jan 30, 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.

3 participants