From ba1979b6fc4f2e7ae355cdc1dd9e3ed3babe92c9 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Tue, 15 Jun 2021 18:42:21 -0700
Subject: [PATCH] [cpack/stabilization/2106] fixed various text entries getting
 clipped after reinstalling the font

---
 .../Packaging/BootstrapperTheme.xml.in        | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 03b5e339e3..f9a177b646 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -17,7 +17,7 @@
 
     <!-- welcome page -->
     <Page Name="Install">
-        <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.InstallHeader)</Text>
+        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.InstallHeader)</Text>
 
 @WIX_THEME_INSTALL_LICENSE_ELEMENTS@
 
@@ -29,9 +29,9 @@
 
     <!-- configure install page -->
     <Page Name="Options">
-        <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
+        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.OptionsHeader)</Text>
 
-        <Text X="42" Y="202" Width="-42" Height="17" FontId="1" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
+        <Text X="42" Y="202" Width="-42" Height="18" FontId="1" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Text>
         <Editbox Name="FolderEditbox" X="42" Y="231" Width="354" Height="21" TabStop="yes" FontId="1" FileSystemAutoComplete="yes" />
         <Button Name="BrowseButton" X="406" Y="230" Width="80" Height="23" TabStop="yes" FontId="1">#(loc.OptionsBrowseButton)</Button>
 
@@ -42,7 +42,7 @@
 
     <!-- edit existing install page -->
     <Page Name="Modify">
-        <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
+        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
         <Button Name="RepairButton" X="-190" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
@@ -52,10 +52,10 @@
 
     <!-- action progress page -->
     <Page Name="Progress">
-        <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
+        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
 
-        <Text X="42" Y="202" Width="70" Height="17" FontId="1" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
-        <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="17" FontId="2" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
+        <Text X="42" Y="202" Width="70" Height="18" FontId="1" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
+        <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="18" FontId="2" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
         <Progressbar Name="OverallCalculatedProgressbar" X="42" Y="230" Width="-90" Height="20" />
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
@@ -64,10 +64,10 @@
 
     <!-- final page (success state) -->
     <Page Name="Success">
-        <Text Name="SuccessHeader" X="38" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-        <Text Name="SuccessInstallHeader" X="38" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
-        <Text Name="SuccessRepairHeader" X="38" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
-        <Text Name="SuccessUninstallHeader" X="38" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
+        <Text Name="SuccessHeader" X="38" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+        <Text Name="SuccessInstallHeader" X="38" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
+        <Text Name="SuccessRepairHeader" X="38" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
+        <Text Name="SuccessUninstallHeader" X="38" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
 
         <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
         <Button Name="LaunchButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
@@ -77,10 +77,10 @@
     <!-- final page (failure state) -->
     <Page Name="Failure">
         <Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@"/>
-        <Text Name="FailureHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
-        <Text Name="FailureInstallHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
-        <Text Name="FailureUninstallHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
-        <Text Name="FailureRepairHeader" X="86" Y="142" Width="-42" Height="30" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
+        <Text Name="FailureHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+        <Text Name="FailureInstallHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
+        <Text Name="FailureUninstallHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
+        <Text Name="FailureRepairHeader" X="86" Y="142" Width="-42" Height="34" FontId="0" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
 
         <Hypertext Name="FailureLogFileLink" X="90" Y="202" Width="-42" Height="80" FontId="1" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
         <Hypertext Name="FailureMessageText" X="135" Y="282" Width="-42" Height="80" FontId="1" TabStop="yes" HideWhenDisabled="yes" />
@@ -91,7 +91,7 @@
 
     <!-- help page -->
     <Page Name="Help">
-        <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.HelpHeader)</Text>
+        <Text X="38" Y="142" Width="-42" Height="34" FontId="0" DisablePrefix="yes">#(loc.HelpHeader)</Text>
 
         <Text X="42" Y="202" Width="-42" Height="-50" FontId="1" DisablePrefix="yes">#(loc.HelpText)</Text>