Skip to content

Conversation

@gitforwindowshelper
Copy link

Signed-off-by: Johannes Schindelin <[email protected]>
The signature of the `CreateCustomForm()` function changed. See also
jrsoftware/issrc#573.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member

dscho commented Nov 12, 2025

This will require substantial work:

image

(Note how the trick we use to "color" words by overwriting the regular words with colored words is off by some vertical pixels, and the bottom part is cut off.)

@dscho
Copy link
Member

dscho commented Nov 12, 2025

In https://jrsoftware.github.io/issrc/whatsnew.htm, the change of the DialogFontBaseScaleHeight is mentioned, so I could fix this relatively easily.

(The new) Dark Mode would need a bit more work, though:

image

Note the Git logo's white background, the lack of red text, and the too bright white text.

According to https://jrsoftware.github.io/issrc/whatsnew.htm, the
default `DialogFontBaseScaleHeight` (which used to be 13) has changed.
We need to accommodate for that change so that the red text and the
links overlay the unstyled text again.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
Copy link
Member

dscho commented Nov 13, 2025

There seem to be slight issues with the red overlay over the regular text, e.g. notice how the Warning: This will override tools [...] line looks like the letters have shadows:

image

Nevertheless, I'd like to merge this before building Git for Windows v2.52.0-rc2. Objections?

@dscho dscho marked this pull request as ready for review November 13, 2025 08:56
@dscho
Copy link
Member

dscho commented Nov 13, 2025

To be clear: Dark Mode is not supported at this time.

@dscho dscho merged commit 91b9d41 into main Nov 13, 2025
7 checks passed
@dscho dscho deleted the innosetup-6.6.0 branch November 13, 2025 09:57
@dscho
Copy link
Member

dscho commented Nov 13, 2025

/add relnote feature The Git for Windows installer is now built with version 6.6.0 of InnoSetup, giving it a more modern look.

The workflow run was started

github-actions bot pushed a commit that referenced this pull request Nov 13, 2025
The Git for Windows installer is [now
built](#655) with
[version
6.6.0](https://jrsoftware.org/files/is6-whatsnew.htm#:~:text=6.6.0) of
InnoSetup, giving it a more modern look.

Signed-off-by: gitforwindowshelper[bot] <[email protected]>
Result.Height:=ScaleY(13*RowCount);
Top:=Top+13+18;
Result.Height:=ScaleY(RowHeight*RowCount);
Top:=Top+RowHeight+18;
Copy link
Member

Choose a reason for hiding this comment

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

We sometimes ScaleY() RowHeight and sometimes don't. Could that be the cause of the offset between the red and black text seen in git-for-windows/git#5961 (comment) ?

Copy link
Member

Choose a reason for hiding this comment

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

And is this 18 potentially also derived from RowHeight? (something like (int) RowHeight * 1.5?)

Copy link
Member

Choose a reason for hiding this comment

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

Both quite possible! I do note, though, that git-for-windows/git#5961's screenshot looks very different from the one I provided. I think we'll need to figure out what causes those differences first.

dscho added a commit that referenced this pull request Nov 19, 2025
My adjustments in #655 worked in my tests, at zoom level 125%. But they
do not work at any other zoom level, causing clipped text and awful
layout.

Here, I present the end result of iterating until I ended up with a much
simpler solution than I had originally come up with (and which
unfortunately made it into the Git for Windows v2.52.0 installer).

This fixes git-for-windows/git#5961
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.

[New innosetup version] is-6_6_0

4 participants