PR comments

microsoft · Dec 19, 2019 · 0011ce3 · 0011ce3
1 parent 2841796
commit 0011ce3
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 26 deletions.
diff --git a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
@@ -115,8 +115,8 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeLarge}"/>
 
-                        <Setter Target="BitwiseButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
-                        <Setter Target="BitShiftButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="BitwiseButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="BitShiftButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
 
                         <Setter Target="BitwiseGrid.MinWidth" Value="387"/>
                         <Setter Target="BitwiseGrid.MinHeight" Value="192"/>
@@ -167,8 +167,8 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeMedium}"/>
 
-                        <Setter Target="BitwiseButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
-                        <Setter Target="BitShiftButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="BitwiseButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="BitShiftButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
 
                         <Setter Target="BitwiseGrid.MinWidth" Value="416"/>
                         <Setter Target="BitwiseGrid.MinHeight" Value="144"/>
@@ -217,8 +217,8 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeSmall}"/>
 
-                        <Setter Target="BitwiseButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
-                        <Setter Target="BitShiftButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="BitwiseButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="BitShiftButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
 
                         <Setter Target="BitwiseGrid.MinWidth" Value="194"/>
                         <Setter Target="BitwiseGrid.MinHeight" Value="96"/>

diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml b/src/Calculator/Views/CalculatorScientificOperators.xaml
@@ -177,8 +177,8 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeLarge}"/>
 
-                        <Setter Target="TrigButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
-                        <Setter Target="FuncButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="TrigButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="FuncButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
 
                         <Setter Target="TrigGrid.MinWidth" Value="516"/>
                         <Setter Target="TrigGrid.MinHeight" Value="192"/>
@@ -267,8 +267,8 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeMedium}"/>
 
-                        <Setter Target="TrigButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
-                        <Setter Target="FuncButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="TrigButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="FuncButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
 
                         <Setter Target="TrigGrid.MinWidth" Value="480"/>
                         <Setter Target="TrigGrid.MinHeight" Value="144"/>
@@ -355,8 +355,8 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{ThemeResource OperatorPanelButtonRowSizeSmall}"/>
 
-                        <Setter Target="TrigButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
-                        <Setter Target="FuncButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="TrigButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="FuncButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
 
                         <Setter Target="TrigGrid.MinWidth" Value="258"/>
                         <Setter Target="TrigGrid.MinHeight" Value="96"/>

diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
@@ -69,16 +69,27 @@ void EquationInputArea::AddNewEquation()
         Equations->GetAt(Equations->Size - 1)->IsLastItemInList = false;
     }
 
-    // Cap equations at number of available colors
-    if (Equations->Size >= m_AvailableColors->Size)
+    // Cap equations at 14
+    if (Equations->Size >= 14)
     {
         return;
     }
 
-    m_lastLineColorIndex = (m_lastLineColorIndex + 1) % colorAssignmentMapping.size();
+
+    m_lastLineColorIndex = (m_lastLineColorIndex + 1) % AvailableColors->Size;
 
-    auto eq =
-        ref new EquationViewModel(ref new Equation(), ++m_lastFunctionLabelIndex, AvailableColors->GetAt(colorAssignmentMapping[m_lastLineColorIndex])->Color);
+    int colorIndex;
+
+    if (m_accessibilitySettings->HighContrast)
+    {
+        colorIndex = m_lastLineColorIndex;
+    }
+    else
+    {
+        colorIndex = colorAssignmentMapping[m_lastLineColorIndex];
+    }
+
+    auto eq = ref new EquationViewModel(ref new Equation(), ++m_lastFunctionLabelIndex, AvailableColors->GetAt(colorIndex)->Color);
     eq->IsLastItemInList = true;
     m_equationToFocus = eq;
     Equations->Append(eq);

diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
@@ -112,9 +112,9 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeLarge}"/>
 
-                        <Setter Target="TrigButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
-                        <Setter Target="InequalityButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
-                        <Setter Target="FuncButton.Style" Value="{ThemeResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="TrigButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="InequalityButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
+                        <Setter Target="FuncButton.Style" Value="{StaticResource OperatorPanelButtonLargeStyle}"/>
 
                         <Setter Target="TrigGrid.MinWidth" Value="516"/>
                         <Setter Target="TrigGrid.MinHeight" Value="192"/>
@@ -217,9 +217,9 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{StaticResource OperatorPanelButtonRowSizeMedium}"/>
 
-                        <Setter Target="TrigButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
-                        <Setter Target="InequalityButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
-                        <Setter Target="FuncButton.Style" Value="{ThemeResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="TrigButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="InequalityButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
+                        <Setter Target="FuncButton.Style" Value="{StaticResource OperatorPanelButtonMediumStyle}"/>
 
                         <Setter Target="TrigGrid.MinWidth" Value="480"/>
                         <Setter Target="TrigGrid.MinHeight" Value="144"/>
@@ -320,9 +320,9 @@
 
                         <Setter Target="OperatorPanelRow.MinHeight" Value="{ThemeResource OperatorPanelButtonRowSizeSmall}"/>
 
-                        <Setter Target="TrigButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
-                        <Setter Target="InequalityButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
-                        <Setter Target="FuncButton.Style" Value="{ThemeResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="TrigButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="InequalityButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
+                        <Setter Target="FuncButton.Style" Value="{StaticResource OperatorPanelButtonSmallStyle}"/>
 
                         <Setter Target="TrigGrid.MinWidth" Value="258"/>
                         <Setter Target="TrigGrid.MinHeight" Value="96"/>