diff --git a/src/Calculator/App.xaml b/src/Calculator/App.xaml
index c490d6e6b..2b0466b7e 100644
--- a/src/Calculator/App.xaml
+++ b/src/Calculator/App.xaml
@@ -2227,9 +2227,14 @@
Foreground="{ThemeResource SystemAltMediumHighColor}"
FontFamily="{ThemeResource CalculatorFontFamily}"
FontSize="12"
- Content=""
IsTabStop="False"
- Visibility="Collapsed"/>
+ Visibility="Collapsed">
+
+
+ Visibility="Collapsed">
+
+
diff --git a/src/Calculator/Views/Calculator.xaml b/src/Calculator/Views/Calculator.xaml
index 60db59c98..6162328a1 100644
--- a/src/Calculator/Views/Calculator.xaml
+++ b/src/Calculator/Views/Calculator.xaml
@@ -601,7 +601,7 @@
-
+
+
+
+
+
+
-
-
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
index 89730bef6..1a0e6b172 100644
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
@@ -21,7 +21,7 @@
-
+
@@ -230,6 +230,7 @@
@@ -248,6 +249,7 @@
diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml b/src/Calculator/Views/CalculatorScientificOperators.xaml
index 12478c7ff..6ae7a0847 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml
@@ -21,7 +21,7 @@
-
+
@@ -372,6 +372,7 @@
@@ -390,6 +391,7 @@
@@ -827,6 +829,7 @@
diff --git a/src/Calculator/Views/CalculatorStandardOperators.xaml b/src/Calculator/Views/CalculatorStandardOperators.xaml
index ac54b9548..825563e8c 100644
--- a/src/Calculator/Views/CalculatorStandardOperators.xaml
+++ b/src/Calculator/Views/CalculatorStandardOperators.xaml
@@ -12,7 +12,7 @@
XYFocusKeyboardNavigation="Enabled"
mc:Ignorable="d">
-
+
diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
index d47d18259..6d2089d48 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
@@ -93,7 +93,8 @@
Style="{ThemeResource VariableContainerStyle}"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}">
-
+
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
index e1fab359f..426aba89a 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
@@ -593,6 +593,7 @@
LosingFocus="GraphingControl_LosingFocus"
LostFocus="GraphingControl_LostFocus"
UseSystemFocusVisuals="True"
+ FlowDirection="LeftToRight"
VariablesUpdated="GraphingControl_VariablesUpdated">
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
index 00234b8a8..cc8164a82 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
@@ -19,7 +19,8 @@
-
+
@@ -357,6 +358,7 @@
@@ -379,6 +381,7 @@
@@ -793,6 +796,7 @@
Placement="Bottom">
@@ -884,6 +888,7 @@