From f4f30099482f226c72c0416f5a6ba23184ef95dd Mon Sep 17 00:00:00 2001
From: scottr <scottr@amazon.com>
Date: Tue, 15 Jun 2021 14:45:08 -0700
Subject: [PATCH] [cpack/stabilization/2106] re-layout bottom button bar

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

diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 8a50181732..2d61868694 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -9,6 +9,8 @@
     <Font Id="1" Height="-12" Weight="500" Foreground="000000">Open Sans</Font>
     <!-- special font -->
     <Font Id="2" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Open Sans</Font>
+    <!-- throwaway font for button bar -->
+    <Font Id="3" Height="-12" Weight="500" Foreground="EEEEEE" Background="EEEEEE">Open Sans</Font>
 
     <!-- top banner -->
     <Image X="28" Y="24" Width="168" Height="64" ImageFile="logo.png" Visible="yes"/>
@@ -19,9 +21,10 @@
 
 @WIX_THEME_INSTALL_LICENSE_ELEMENTS@
 
-        <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
-        <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.InstallInstallButton)</Button>
-        <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.InstallCloseButton)</Button>
+        <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>
     </Page>
 
     <!-- configure install page -->
@@ -32,17 +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>
 
-        <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.OptionsOkButton)</Button>
-        <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.OptionsCancelButton)</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>
     </Page>
 
     <!-- edit existing install page -->
     <Page Name="Modify">
         <Text X="38" Y="142" Width="-42" Height="30" FontId="0" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
 
-        <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
-        <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.ModifyUninstallButton)</Button>
-        <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.ModifyCloseButton)</Button>
+        <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>
     </Page>
 
     <!-- action progress page -->
@@ -53,7 +58,8 @@
         <Text Name="OverallProgressPackageText" X="116" Y="202" Width="-42" Height="17" FontId="1" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
         <Progressbar Name="OverallCalculatedProgressbar" X="42" Y="230" Width="-90" Height="20" />
 
-        <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.ProgressCancelButton)</Button>
+        <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>
     </Page>
 
     <!-- final page (success state) -->
@@ -63,8 +69,9 @@
         <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>
 
-        <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-        <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.SuccessCloseButton)</Button>
+        <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>
     </Page>
 
     <!-- final page (failure state) -->
@@ -78,7 +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" />
 
-        <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.FailureCloseButton)</Button>
+        <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>
     </Page>
 
     <!-- help page -->
@@ -87,6 +95,7 @@
 
         <Text X="42" Y="202" Width="-42" Height="-50" FontId="1" DisablePrefix="yes">#(loc.HelpText)</Text>
 
-        <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="2">#(loc.HelpCloseButton)</Button>
+        <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>
     </Page>
 </Theme>
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 8e2f68fddc..c882215030 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=\"-70\" TabStop=\"yes\" FontId=\"2\" HexStyle=\"0x800000\" />
-        <Text Name=\"EulaAcceptance\" X=\"42\" Y=\"-42\" Width=\"-42\" Height=\"17\" TabStop=\"yes\" FontId=\"1\" HideWhenDisabled=\"yes\">#(loc.InstallEulaAcceptance)</Text>
+        <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>
 ")
 
 if(LY_INSTALLER_DOWNLOAD_URL)