diff --git a/src/Calculator/Resources/en-US/Resources.resw b/src/Calculator/Resources/en-US/Resources.resw index 96890ce..93ac919 100644 --- a/src/Calculator/Resources/en-US/Resources.resw +++ b/src/Calculator/Resources/en-US/Resources.resw @@ -4418,6 +4418,10 @@ Graph Options Heading for the Graph Options flyout in Graphing mode. + + Variable options + Screen reader prompt for the variable settings button + Line Thickness Heading for the Graph Options flyout in Graphing mode. diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml index b3a64c3..7273469 100644 --- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml +++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml @@ -209,11 +209,17 @@ Text="{x:Bind Max, Mode=OneWay}"/> - + diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp index 750afe6..6c300d1 100644 --- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp +++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp @@ -451,7 +451,26 @@ String ^ EquationInputArea::GetChevronIcon(bool isCollapsed) void EquationInputArea::VariableAreaTapped(Object ^ sender, TappedRoutedEventArgs ^ e) { - auto selectedVariableViewModel = static_cast(static_cast(sender)->DataContext); + ToggleVariableArea(static_cast(static_cast(sender)->DataContext)); +} + +void EquationInputArea::VariableAreaButtonTapped(Object ^ sender, TappedRoutedEventArgs ^ e) +{ + e->Handled = true; +} + +void EquationInputArea::EquationTextBox_EquationFormatRequested(Object ^ sender, MathRichEditBoxFormatRequest ^ e) +{ + EquationFormatRequested(sender, e); +} + +void EquationInputArea::VariableAreaClicked(Object ^ sender, RoutedEventArgs ^ e) +{ + ToggleVariableArea(static_cast(static_cast