From c8a67eb574e05c1d3a6c38158e9a6d9cbd5b34ac Mon Sep 17 00:00:00 2001
From: Pepe Rivera <joriv@microsoft.com>
Date: Thu, 9 Jan 2020 14:10:48 -0800
Subject: [PATCH] ui changes (#920)

---
 src/Calculator/App.xaml                       | 26 ++++++++++---------
 .../GraphingCalculator/EquationInputArea.xaml |  2 +-
 .../GraphingCalculator.xaml                   |  3 +++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index 3f91ce4..7c282e9 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -69,16 +69,17 @@
                     <ApplicationTheme x:Key="CalcApplicationTheme">Dark</ApplicationTheme>
                     <SolidColorBrush x:Key="AppChromeAcrylicOperatorFlyoutBackgroundBrush" Color="#FF2F2F2F"/>
                     <SolidColorBrush x:Key="AppControlTransparentButtonBackgroundBrush" Color="Transparent"/>
-                    <SolidColorBrush x:Key="EquationBrush1" Color="#FFE81123"/>
-                    <SolidColorBrush x:Key="EquationBrush2" Color="#FFE3008C"/>
-                    <SolidColorBrush x:Key="EquationBrush3" Color="#FFB31564"/>
+
+                    <SolidColorBrush x:Key="EquationBrush1" Color="#FF0063B1"/>
+                    <SolidColorBrush x:Key="EquationBrush2" Color="#FF00B7C3"/>
+                    <SolidColorBrush x:Key="EquationBrush3" Color="#FF6600CC"/>
                     <SolidColorBrush x:Key="EquationBrush4" Color="#FF107C10"/>
                     <SolidColorBrush x:Key="EquationBrush5" Color="#FF00CC6A"/>
                     <SolidColorBrush x:Key="EquationBrush6" Color="#FF008055"/>
                     <SolidColorBrush x:Key="EquationBrush7" Color="#FF58595B"/>
-                    <SolidColorBrush x:Key="EquationBrush8" Color="#FF0063B1"/>
-                    <SolidColorBrush x:Key="EquationBrush9" Color="#FF00B7C3"/>
-                    <SolidColorBrush x:Key="EquationBrush10" Color="#FF6600CC"/>
+                    <SolidColorBrush x:Key="EquationBrush8" Color="#FFE81123"/>
+                    <SolidColorBrush x:Key="EquationBrush9" Color="#FFE3008C"/>
+                    <SolidColorBrush x:Key="EquationBrush10" Color="#FFB31564"/>
                     <SolidColorBrush x:Key="EquationBrush11" Color="#FFFFB900"/>
                     <SolidColorBrush x:Key="EquationBrush12" Color="#FFF7630C"/>
                     <SolidColorBrush x:Key="EquationBrush13" Color="#FF8E562E"/>
@@ -147,16 +148,17 @@
                                   TintOpacity="0.8"/>
                     <ApplicationTheme x:Key="CalcApplicationTheme">Light</ApplicationTheme>
                     <SolidColorBrush x:Key="AppControlTransparentButtonBackgroundBrush" Color="Transparent"/>
-                    <SolidColorBrush x:Key="EquationBrush1" Color="#FFE81123"/>
-                    <SolidColorBrush x:Key="EquationBrush2" Color="#FFE3008C"/>
-                    <SolidColorBrush x:Key="EquationBrush3" Color="#FFB31564"/>
+
+                    <SolidColorBrush x:Key="EquationBrush1" Color="#FF0063B1"/>
+                    <SolidColorBrush x:Key="EquationBrush2" Color="#FF00B7C3"/>
+                    <SolidColorBrush x:Key="EquationBrush3" Color="#FF6600CC"/>
                     <SolidColorBrush x:Key="EquationBrush4" Color="#FF107C10"/>
                     <SolidColorBrush x:Key="EquationBrush5" Color="#FF00CC6A"/>
                     <SolidColorBrush x:Key="EquationBrush6" Color="#FF008055"/>
                     <SolidColorBrush x:Key="EquationBrush7" Color="#FF58595B"/>
-                    <SolidColorBrush x:Key="EquationBrush8" Color="#FF0063B1"/>
-                    <SolidColorBrush x:Key="EquationBrush9" Color="#FF00B7C3"/>
-                    <SolidColorBrush x:Key="EquationBrush10" Color="#FF6600CC"/>
+                    <SolidColorBrush x:Key="EquationBrush8" Color="#FFE81123"/>
+                    <SolidColorBrush x:Key="EquationBrush9" Color="#FFE3008C"/>
+                    <SolidColorBrush x:Key="EquationBrush10" Color="#FFB31564"/>
                     <SolidColorBrush x:Key="EquationBrush11" Color="#FFFFB900"/>
                     <SolidColorBrush x:Key="EquationBrush12" Color="#FFF7630C"/>
                     <SolidColorBrush x:Key="EquationBrush13" Color="#FF8E562E"/>
diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
index bf028dc..e6c1a2a 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
@@ -763,7 +763,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <mux:ItemsRepeaterScrollHost>
-        <ScrollViewer>
+        <ScrollViewer VerticalScrollBarVisibility="Auto">
             <StackPanel>
                 <mux:ItemsRepeater x:Name="EquationInputList"
                                    ItemsSource="{x:Bind Equations}"
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index b74a14d..8857616 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -567,6 +567,9 @@
                         <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}"
                                   FontSize="14"
                                   Glyph="&#xE895;"/>
+                        <Button.KeyboardAccelerators>
+                            <KeyboardAccelerator Key="Number0" Modifiers="Control"/>
+                        </Button.KeyboardAccelerators>
                     </Button>
                 </StackPanel>
             </Border>