From 91dec06f66badef3f94385a760eec72ac0a475f8 Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Tue, 15 Jun 2021 15:56:14 -0700
Subject: [PATCH] [cpack/stabilization/2106] minor tweaks: increased button
 height to fit admin icon, fixed button bar background size issue, fixed
 progress text overwrite bug

---
 .../Packaging/BootstrapperTheme.xml.in        | 44 +++++++++----------
 .../Platform/Windows/Packaging_windows.cmake  |  4 +-
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 2d61868694..03b5e339e3 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -21,10 +21,10 @@
 
 @WIX_THEME_INSTALL_LICENSE_ELEMENTS@
 
-        <Text X="0" Y="426" Width="672" Height="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="OptionsButton" X="-190" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
-        <Button Name="InstallButton" X="-106" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.InstallInstallButton)</Button>
-        <Button Name="WelcomeCancelButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.InstallCloseButton)</Button>
+        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
+        <Button Name="OptionsButton" X="-190" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
+        <Button Name="InstallButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.InstallInstallButton)</Button>
+        <Button Name="WelcomeCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.InstallCloseButton)</Button>
     </Page>
 
     <!-- configure install page -->
@@ -35,19 +35,19 @@
         <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>
 
-        <Text X="0" Y="426" Width="672" Height="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="OptionsOkButton" X="-106" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>
-        <Button Name="OptionsCancelButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.OptionsCancelButton)</Button>
+        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
+        <Button Name="OptionsOkButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>
+        <Button Name="OptionsCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.OptionsCancelButton)</Button>
     </Page>
 
     <!-- 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="0" Y="426" Width="672" Height="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="RepairButton" X="-190" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
-        <Button Name="UninstallButton" X="-106" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.ModifyUninstallButton)</Button>
-        <Button Name="ModifyCancelButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.ModifyCloseButton)</Button>
+        <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>
+        <Button Name="UninstallButton" X="-106" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.ModifyUninstallButton)</Button>
+        <Button Name="ModifyCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.ModifyCloseButton)</Button>
     </Page>
 
     <!-- action progress page -->
@@ -55,11 +55,11 @@
         <Text X="38" Y="142" Width="-42" Height="30" 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="1" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
+        <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="17" 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="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="ProgressCancelButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.ProgressCancelButton)</Button>
+        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
+        <Button Name="ProgressCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.ProgressCancelButton)</Button>
     </Page>
 
     <!-- final page (success state) -->
@@ -69,14 +69,14 @@
         <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 X="0" Y="426" Width="672" Height="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="LaunchButton" X="-106" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-        <Button Name="SuccessCancelButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.SuccessCloseButton)</Button>
+        <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>
+        <Button Name="SuccessCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.SuccessCloseButton)</Button>
     </Page>
 
     <!-- final page (failure state) -->
     <Page Name="Failure">
-        <Image X="38" Y="132" Width="42" Height="42" ImageFile="@WIX_THEME_WARNING_IMAGE@" HideWhenDisabled="yes"/>
+        <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>
@@ -85,8 +85,8 @@
         <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" />
 
-        <Text X="0" Y="426" Width="672" Height="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="FailureCloseButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.FailureCloseButton)</Button>
+        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
+        <Button Name="FailureCloseButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.FailureCloseButton)</Button>
     </Page>
 
     <!-- help page -->
@@ -95,7 +95,7 @@
 
         <Text X="42" Y="202" Width="-42" Height="-50" FontId="1" DisablePrefix="yes">#(loc.HelpText)</Text>
 
-        <Text X="0" Y="426" Width="672" Height="42" FontId="3" HideWhenDisabled="yes" />
-        <Button Name="HelpCancelButton" X="-22" Y="-10" Width="80" Height="22" TabStop="yes" FontId="2">#(loc.HelpCloseButton)</Button>
+        <Text X="0" Y="426" Width="672" Height="46" FontId="3" HideWhenDisabled="yes" />
+        <Button Name="HelpCancelButton" X="-22" Y="-10" Width="80" Height="24" TabStop="yes" FontId="2">#(loc.HelpCloseButton)</Button>
     </Page>
 </Theme>
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index c882215030..5df53d158c 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -96,8 +96,8 @@ set(_hyperlink_license "
 ")
 
 set(_raw_text_license "
-        <Richedit Name=\"EulaRichedit\" X=\"42\" Y=\"202\" Width=\"-42\" Height=\"-80\" TabStop=\"yes\" FontId=\"2\" HexStyle=\"0x800000\" />
-        <Text Name=\"EulaAcceptance\" X=\"42\" Y=\"-54\" Width=\"-42\" Height=\"17\" TabStop=\"yes\" FontId=\"1\" HideWhenDisabled=\"yes\">#(loc.InstallEulaAcceptance)</Text>
+        <Richedit Name=\"EulaRichedit\" X=\"42\" Y=\"202\" Width=\"-42\" Height=\"-84\" TabStop=\"yes\" FontId=\"2\" HexStyle=\"0x800000\" />
+        <Text Name=\"EulaAcceptance\" X=\"42\" Y=\"-56\" Width=\"-42\" Height=\"18\" TabStop=\"yes\" FontId=\"1\" HideWhenDisabled=\"yes\">#(loc.InstallEulaAcceptance)</Text>
 ")
 
 if(LY_INSTALLER_DOWNLOAD_URL)