mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 09:27:59 +00:00
371c7d12f5
We received a report that if you enable Windows 10's high-contrast mode, the text in PuTTY's installer UI becomes invisible, because it's displayed in the system default foreground colour against a background of the white right-hand side of our 'msidialog.bmp' image. That's fine when the system default fg is black, but high-contrast mode flips it to white, and now you have white on white text, oops. Some research in the WiX bug tracker suggests that in Windows 10 you don't actually have to use BMP files for your installer images any more: you can use PNG, and PNGs can be transparent. However, someone else reported that that only works in up-to-date versions of Windows. And in fact there's no need to go that far. A more elegant answer is to simply not cover the whole dialog box with our background image in the first place. I've reduced the size of the background image so that it _only_ contains the pretty picture on the left-hand side, and omits the big white rectangle that used to sit under the text. So now the RHS of the dialog is not covered by any image at all, which has the same effect as it being covered with a transparent image, except that it doesn't require transparency support from msiexec. Either way, the background for the text ends up being the system's default dialog-box background, in the absence of any images or controls placed on top of it - so when the high-contrast mode is enabled, it flips to black at the same time as the text flips to white, and everything works as it should. The slight snag is that the pre-cooked WiX UI dialog specifications let you override the background image itself, but not the Width and Height fields in the control specifications that refer to them. So if you just try to drop in a narrow image in the most obvious way, it gets stretched across the whole window. But that's not a show-stopper, because we're not 100% dependent on getting WiX to produce exactly the right output. We already have the technology to postprocess the MSI _after_ it comes out of WiX: we're using it to fiddle the target-platform field for the Windows on Arm installers. So all I had to do was to turn msiplatform.py into a more general msifixup.py, add a second option to change the width of the dialog background image, and run it on the x86 installers as well as the Arm ones.
23 lines
784 B
Bash
Executable File
23 lines
784 B
Bash
Executable File
#!/bin/sh
|
|
|
|
# Script to make the bitmap files that go into the PuTTY MSI installer.
|
|
|
|
set -e
|
|
|
|
# For convenience, allow this script to be run from the Windows
|
|
# subdirectory as well as the top level of the source tree.
|
|
if test -f installer.wxs -a ! -f putty.h -a -f ../putty.h; then
|
|
cd ..
|
|
fi
|
|
|
|
convert -size 164x312 'gradient:blue-white' -distort SRT -90 -swirl 180 \
|
|
\( icons/putty-48.png -geometry +28+24 \) -composite \
|
|
\( icons/pscp-48.png -geometry +88+96 \) -composite \
|
|
\( icons/puttygen-48.png -geometry +28+168 \) -composite \
|
|
\( icons/pageant-48.png -geometry +88+240 \) -composite \
|
|
windows/msidialog.bmp
|
|
|
|
convert -size 493x58 canvas:white \
|
|
\( icons/putty-48.png -geometry +440+5 \) -composite \
|
|
windows/msibanner.bmp
|