From 3b916dcec3f365d9a18c565d9d6eff5e2b3ea8ad Mon Sep 17 00:00:00 2001
From: Pepe Rivera <joriv@microsoft.com>
Date: Fri, 3 Jan 2020 10:45:51 -0800
Subject: [PATCH] Minor changes to share output (#886)

* Make some tweaks to share output

* adjust strings

* one more tweak

* Remove unneeded span
---
 src/Calculator/Resources/en-US/Resources.resw        |  6 +++---
 .../GraphingCalculator/GraphingCalculator.xaml.cpp   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw
index 8182ac5..f4d5b1d 100644
--- a/src/Calculator/Resources/en-US/Resources.resw
+++ b/src/Calculator/Resources/en-US/Resources.resw
@@ -3912,15 +3912,15 @@
     <comment>Used on the dismiss button of the share action error dialog.</comment>
   </data>
   <data name="ShareActionTitle" xml:space="preserve">
-    <value>Look what I graphed.</value>
+    <value>Look what I graphed with Windows Calculator</value>
     <comment>Sent as part of the shared content. The title for the share.</comment>
   </data>
   <data name="EquationsShareHeader" xml:space="preserve">
-    <value>Equations:</value>
+    <value>Equations</value>
     <comment>Header that appears over the equations section when sharing</comment>
   </data>
   <data name="VariablesShareHeader" xml:space="preserve">
-    <value>Variables:</value>
+    <value>Variables</value>
     <comment>Header that appears over the variables section when sharing</comment>
   </data>
   <data name="GraphImageAltText" xml:space="preserve">
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
index 137c676..8bd4fb4 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cpp
@@ -218,7 +218,7 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
             equationHtml << L"<span style=\"color: rgb(68, 114, 196); font-style: bold; font-size : 13pt;\">";
             equationHtml << resourceLoader->GetString(L"EquationsShareHeader")->Data();
             equationHtml << L"</span>";
-            equationHtml << L"<table cellpadding=\"0\">";
+            equationHtml << L"<table cellpadding=\"0\" cellspacing=\"0\" >";
 
             for (auto equation : equations)
             {
@@ -237,8 +237,8 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
                 equationColorHtml << L"color:rgb(" << color.R.ToString()->Data() << L"," << color.G.ToString()->Data() << L"," << color.B.ToString()->Data()
                                   << L");";
 
-                equationHtml << L"<tr><td><span style=\"line-height: 0; font-size: 24pt;" << equationColorHtml.str()
-                             << L"\">&#x25A0;</span></td><td><div style=\"margin: 4pt 0pt 0pt 0pt; \">";
+                equationHtml << L"<tr style=\"margin: 0pt 0pt 0pt 0pt; padding: 0pt 0pt 0pt 0pt; \"><td><span style=\"font-size: 22pt; line-height: 0;" << equationColorHtml.str()
+                             << L"\">&#x25A0;</span></td><td><div style=\"margin: 4pt 0pt 0pt 6pt;\">";
                 equationHtml << EscapeHtmlSpecialCharacters(expression)->Data();
                 equationHtml << L"</div></td>";
             }
@@ -256,9 +256,9 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
         {
             auto localizedSeperator = LocalizationSettings::GetInstance().GetListSeparator() + L" ";
 
-            rawHtml << L"<span style=\"color: rgb(68, 114, 196); font-style: bold; font-size: 13pt;\">";
+            rawHtml << L"<br><span style=\"color: rgb(68, 114, 196); font-style: bold; font-size: 13pt;\">";
             rawHtml << resourceLoader->GetString(L"VariablesShareHeader")->Data();
-            rawHtml << L"</span><br><span>";
+            rawHtml << L"</span><br><div style=\"margin: 4pt 0pt 0pt 0pt;\">";
 
             for (unsigned i = 0; i < variables->Size; i++)
             {
@@ -277,7 +277,7 @@ void GraphingCalculator::OnDataRequested(DataTransferManager ^ sender, DataReque
                 }
             }
 
-            rawHtml << L"</span>";
+            rawHtml << L"</div>";
         }
 
         rawHtml << L"<br><br>";