Equation button updates: Enable/Disable on click, button content f1, f2, f3..., visibility icon on hover

src/CalcViewModel/CalcViewModel.vcxproj

@@ -448,4 +448,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.UI.Xaml.2.0.181018003.1\build\native\Microsoft.UI.Xaml.targets'))" />
   </Target>
-</Project>
+</Project>

src/CalcViewModel/GraphingCalculator/EquationViewModel.cpp

@@ -34,6 +34,7 @@ namespace CalculatorApp::ViewModel
 
     EquationViewModel::EquationViewModel(GraphControl::Equation ^ equation)
         : m_AnalysisErrorVisible{ false }
+        , m_FunctionLabelIndex{ 0 }
         , m_KeyGraphFeaturesItems{ ref new Vector<KeyGraphFeaturesItem ^>() }
         , m_resourceLoader{ Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView() }
     {

src/CalcViewModel/GraphingCalculator/EquationViewModel.h

@@ -40,6 +40,7 @@ public
 
         OBSERVABLE_OBJECT();
         OBSERVABLE_PROPERTY_R(GraphControl::Equation ^, GraphEquation);
+        OBSERVABLE_PROPERTY_RW(int, FunctionLabelIndex);
 
         property Platform::String ^ Expression
         {
@@ -73,6 +74,22 @@ public
             }
         }
 
+        property bool IsLineEnabled
+        {
+            bool get()
+            {
+                return GraphEquation->IsLineEnabled;
+            }
+            void set(bool value)
+            {
+                if (GraphEquation->IsLineEnabled != value)
+                {
+                    GraphEquation->IsLineEnabled = value;
+                    RaisePropertyChanged("IsLineEnabled");
+                }
+            }
+        }
+
         // Key Graph Features
         OBSERVABLE_PROPERTY_R(Platform::String ^, AnalysisErrorString);
         OBSERVABLE_PROPERTY_R(bool, AnalysisErrorVisible);

src/Calculator/Calculator.vcxproj.filters

@@ -1489,5 +1489,11 @@
   <ItemGroup>
     <CopyFileToFolders Include="$(GraphingImplDll)" />
     <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
+    <CopyFileToFolders Include="$(GraphingImplDll)" />
+    <CopyFileToFolders Include="$(GraphingEngineDll)" />
   </ItemGroup>
 </Project>

src/Calculator/Controls/EquationTextBox.cpp

@@ -21,10 +21,12 @@ using namespace Windows::UI::Xaml::Controls::Primitives;
 
 DEPENDENCY_PROPERTY_INITIALIZATION(EquationTextBox, EquationColor);
 DEPENDENCY_PROPERTY_INITIALIZATION(EquationTextBox, ColorChooserFlyout);
+DEPENDENCY_PROPERTY_INITIALIZATION(EquationTextBox, EquationButtonContentIndex);
+
 
 void EquationTextBox::OnApplyTemplate()
 {
-    m_equationButton = dynamic_cast<Button ^>(GetTemplateChild("EquationButton"));
+    m_equationButton = dynamic_cast<ToggleButton ^>(GetTemplateChild("EquationButton"));
     m_richEditBox = dynamic_cast<MathRichEditBox ^>(GetTemplateChild("EquationTextBox"));
     m_deleteButton = dynamic_cast<Button ^>(GetTemplateChild("DeleteButton"));
     m_removeButton = dynamic_cast<Button ^>(GetTemplateChild("RemoveButton"));
@@ -187,6 +189,13 @@ void EquationTextBox::OnRemoveButtonClicked(Object ^ sender, RoutedEventArgs ^ e
     {
         m_functionButton->IsEnabled = false;
     }
+
+    if (m_equationButton)
+    {
+        m_equationButton->IsChecked = false;
+    }
+
+    VisualStateManager::GoToState(this, "Normal", true);
 }
 
 void EquationTextBox::OnColorChooserButtonClicked(Object ^ sender, RoutedEventArgs ^ e)

src/Calculator/Controls/EquationTextBox.h

@@ -21,6 +21,7 @@ namespace CalculatorApp
             DEPENDENCY_PROPERTY_OWNER(EquationTextBox);
             DEPENDENCY_PROPERTY(Windows::UI::Xaml::Media::SolidColorBrush^, EquationColor);
             DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::Flyout^, ColorChooserFlyout);
+            DEPENDENCY_PROPERTY(Platform::String ^, EquationButtonContentIndex);
 
             PROPERTY_R(bool, HasFocus);
 
@@ -60,7 +61,7 @@ namespace CalculatorApp
             void OnColorFlyoutClosed(Platform::Object^ sender, Platform::Object^ e);
 
             CalculatorApp::Controls::MathRichEditBox^ m_richEditBox;
-            Windows::UI::Xaml::Controls::Button^ m_equationButton;
+            Windows::UI::Xaml::Controls::Primitives::ToggleButton^ m_equationButton;
             Windows::UI::Xaml::Controls::Button^ m_deleteButton;
             Windows::UI::Xaml::Controls::Button^ m_removeButton;
             Windows::UI::Xaml::Controls::Button^ m_functionButton;

src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml

@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:controls="using:CalculatorApp.Controls"
+             xmlns:converters="using:CalculatorApp.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="using:CalculatorApp"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -49,6 +50,8 @@
                                               Margin="1,0,1,0"
                                               Style="{StaticResource EquationTextBoxStyle}"
                                               EquationColor="{x:Bind LineColor, Mode=OneWay}"
+                                              EquationButtonClicked="EquationTextBox_EquationButtonClicked"
+                                              EquationButtonContentIndex="{x:Bind FunctionLabelIndex, Mode=OneWay}"
                                               EquationSubmitted="InputTextBox_Submitted"
                                               GotFocus="InputTextBox_GotFocus"
                                               Loaded="EquationTextBoxLoaded"

src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp

@@ -68,7 +68,8 @@ void EquationInputArea::AddNewEquation()
     m_lastLineColorIndex = (m_lastLineColorIndex + 1) % AvailableColors->Size;
 
     eq->LineColor = AvailableColors->GetAt(m_lastLineColorIndex);
-
+    eq->IsLineEnabled = true;
+    eq->FunctionLabelIndex = ++m_lastFunctionLabelIndex;
     Equations->Append(eq);
     EquationInputList->ScrollIntoView(eq);
 }
@@ -102,6 +103,11 @@ void EquationInputArea::EquationTextBox_RemoveButtonClicked(Object ^ sender, Rou
     unsigned int index;
     if (Equations->IndexOf(eq, &index))
     {
+        if (eq->FunctionLabelIndex == m_lastFunctionLabelIndex)
+        {
+            m_lastFunctionLabelIndex--;
+        }
+
         Equations->RemoveAt(index);
     }
 }
@@ -116,6 +122,9 @@ void EquationInputArea::EquationTextBox_KeyGraphFeaturesButtonClicked(Object ^ s
 
 void EquationInputArea::EquationTextBox_EquationButtonClicked(Object ^ sender, RoutedEventArgs ^ e)
 {
+    auto tb = static_cast<EquationTextBox ^>(sender);
+    auto eq = static_cast<EquationViewModel ^>(tb->DataContext);
+    eq->IsLineEnabled = !eq->IsLineEnabled;
 }
 
 void EquationInputArea::EquationTextBoxLoaded(Object ^ sender, RoutedEventArgs ^ e)

src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.h

@@ -10,6 +10,7 @@
 #include "CalcViewModel/Common/KeyboardShortcutManager.h"
 #include "Controls/EquationTextBox.h"
 #include "Converters/BooleanNegationConverter.h"
+#include "Controls/MathRichEditBox.h"
 
 namespace CalculatorApp
 {
@@ -22,7 +23,6 @@ namespace CalculatorApp
         OBSERVABLE_PROPERTY_RW(Windows::Foundation::Collections::IObservableVector< ViewModel::EquationViewModel^ >^, Equations);
         OBSERVABLE_PROPERTY_RW_ALWAYS_NOTIFY(ViewModel::EquationViewModel ^, EquationVM);
         OBSERVABLE_PROPERTY_RW(Windows::Foundation::Collections::IObservableVector<Windows::UI::Xaml::Media::SolidColorBrush ^> ^, AvailableColors);
-
         event Windows::UI::Xaml::RoutedEventHandler ^ KeyGraphFeaturesRequested;
 
     private:
@@ -42,6 +42,7 @@ namespace CalculatorApp
     private:
         Windows::UI::ViewManagement::AccessibilitySettings ^ m_accessibilitySettings;
         int m_lastLineColorIndex;
+        int m_lastFunctionLabelIndex;
         void EquationTextBox_RemoveButtonClicked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void EquationTextBox_KeyGraphFeaturesButtonClicked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);
         void EquationTextBox_EquationButtonClicked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);

src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml

@@ -150,36 +150,39 @@
                                 <RowDefinition Height="Auto"/>
                             </Grid.RowDefinitions>
 
-                            <Button x:Name="EquationButton"
-                                    MinWidth="44"
-                                    MinHeight="44"
-                                    VerticalAlignment="Stretch"
-                                    Background="{TemplateBinding EquationColor}"
-                                    Foreground="{StaticResource SystemChromeWhiteColor}"
-                                    BorderThickness="0">
-                                <Button.Content>
-                                    <StackPanel Margin="5,0"
-                                                VerticalAlignment="Top"
-                                                Orientation="Horizontal">
+                            <ToggleButton x:Name="EquationButton"
+                                          MinWidth="44"
+                                          MinHeight="44"
+                                          VerticalAlignment="Stretch"
+                                          Background="{TemplateBinding EquationColor}"
+                                          Foreground="{StaticResource SystemChromeWhiteColor}"
+                                          BorderThickness="0">
+                                <ToggleButton.Content>
+                                    <StackPanel x:Name="FunctionNumberLabel"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Background="Transparent"
+                                                    Orientation="Horizontal"
+                                                    Margin="5,0">
                                         <FontIcon VerticalAlignment="Center"
                                                   FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                   FontSize="16"
                                                   Glyph="&#xE72B;"/>
-                                        <TextBlock Margin="12,-4,0,0"
-                                                   VerticalAlignment="Top"
-                                                   FontFamily="{TemplateBinding FontFamily}"
-                                                   FontSize="16"
-                                                   Text="ƒₓ"/>
+                                        <TextBlock Text="ƒ" Margin="12,0,0,0"/>
+                                        <TextBlock Margin="0,10,0,0"
+                                                       FontSize="9"
+                                                       Text="{TemplateBinding EquationButtonContentIndex}"/>
                                     </StackPanel>
-                                </Button.Content>
-                                <Button.Resources>
+
+                                </ToggleButton.Content>
+                                <ToggleButton.Resources>
                                     <SolidColorBrush x:Name="ButtonBackgroundPointerOver"
                                                      Opacity="0.7"
                                                      Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EquationColor.Color}"/>
                                     <SolidColorBrush x:Name="ButtonForegroundPointerOver" Color="{ThemeResource SystemChromeWhiteColor}"/>
                                     <SolidColorBrush x:Name="ButtonBorderBrushPointerOver" Color="Transparent"/>
-                                </Button.Resources>
-                            </Button>
+                                </ToggleButton.Resources>
+                            </ToggleButton>
 
                             <controls:MathRichEditBox x:Name="EquationTextBox"
                                                       Grid.Column="1"
@@ -431,6 +434,8 @@
                                   BorderThickness="0"
                                   DataContext="{x:Bind ViewModel, Mode=OneWay}"
                                   EquationButtonClicked="EquationButtonClicked"
+                                  EquationButtonContentIndex="{x:Bind ViewModel.FunctionLabelIndex, Mode=OneWay}"
+                                  EquationColor="{x:Bind ViewModel.LineColor, Mode=OneWay}"
                                   Loaded="EquationInputTextBox_Loaded"/>
         <TextBlock x:Uid="KeyGraphFeaturesLabel"
                    Grid.Row="1"

src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.cpp

@@ -14,9 +14,7 @@ using namespace Windows::UI::Xaml;
 using namespace Windows::UI::Xaml::Controls;
 
 KeyGraphFeaturesPanel::KeyGraphFeaturesPanel()
-
 {
-
     InitializeComponent();
 }
 
@@ -49,5 +47,4 @@ void KeyGraphFeaturesPanel::EquationInputTextBox_Loaded(Object ^ sender, RoutedE
 void KeyGraphFeaturesPanel::SetEquationTextBoxProperties()
 {
     EquationInputTextBox->SetEquationText(ViewModel->Expression);
-    EquationInputTextBox->EquationColor = ViewModel->LineColor;
 }

src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.h

@@ -18,7 +18,6 @@ public
 
         OBSERVABLE_OBJECT_CALLBACK(OnPropertyChanged);
         OBSERVABLE_PROPERTY_RW_ALWAYS_NOTIFY(CalculatorApp::ViewModel::EquationViewModel ^, ViewModel);
-
         event Windows::UI::Xaml::RoutedEventHandler ^ KeyGraphFeaturesClosed;
 
     private:

src/GraphControl/Control/Equation.cpp

@@ -23,7 +23,10 @@ namespace GraphControl
     DependencyProperty ^ Equation::s_lineColorProperty;
     static constexpr auto s_propertyName_LineColor = L"LineColor";
 
-    DependencyProperty ^ Equation::s_xInterceptProperty;
+    DependencyProperty ^ Equation::s_isLineEnabledProperty;
+    static constexpr auto s_propertyName_IsLineEnabled = L"IsLineEnabled";
+
+	DependencyProperty ^ Equation::s_xInterceptProperty;
     static constexpr auto s_propertyName_XIntercept = L"XIntercept";
 
     DependencyProperty ^ Equation::s_yInterceptProperty;
@@ -75,6 +78,7 @@ namespace GraphControl
     {
         String ^ Expression = StringReference(s_propertyName_Expression);
         String ^ LineColor = StringReference(s_propertyName_LineColor);
+        String ^ IsLineEnabled = StringReference(s_propertyName_IsLineEnabled);
         String ^ XIntercept = StringReference(s_propertyName_XIntercept);
         String ^ YIntercept = StringReference(s_propertyName_YIntercept);
         String ^ Parity = StringReference(s_propertyName_Parity);
@@ -116,6 +120,15 @@ namespace GraphControl
                 ref new PropertyMetadata(nullptr, ref new PropertyChangedCallback(&Equation::OnCustomDependencyPropertyChanged)));
         }
 
+        if (!s_isLineEnabledProperty)
+        {
+            s_isLineEnabledProperty = DependencyProperty::Register(
+                EquationProperties::IsLineEnabled,
+                bool ::typeid,
+                Equation::typeid,
+                ref new PropertyMetadata(nullptr, ref new PropertyChangedCallback(&Equation::OnCustomDependencyPropertyChanged)));
+        }
+
         if (!s_xInterceptProperty)
         {
             s_xInterceptProperty = DependencyProperty::Register(
@@ -273,6 +286,10 @@ namespace GraphControl
             {
                 propertyName = EquationProperties::LineColor;
             }
+            else if (args->Property == s_isLineEnabledProperty)
+            {
+                propertyName = EquationProperties::IsLineEnabled;
+            }
             else if (args->Property == s_xInterceptProperty)
             {
                 propertyName = EquationProperties::XIntercept;

src/GraphControl/Control/Equation.h

@@ -9,6 +9,7 @@ namespace GraphControl
     {
         extern Platform::String ^ Expression;
         extern Platform::String ^ LineColor;
+        extern Platform::String ^ IsLineEnabled;
     }
 
     ref class Equation;
@@ -68,6 +69,28 @@ namespace GraphControl
         }
 #pragma endregion
 
+#pragma region bool IsLineEnabled DependencyProperty
+        static property Windows::UI::Xaml::DependencyProperty ^ IsLineEnabledProperty
+        {
+            Windows::UI::Xaml::DependencyProperty ^ get()
+            {
+                return s_isLineEnabledProperty;
+            }
+        }
+        property bool IsLineEnabled
+        {
+            bool get()
+            {
+                return static_cast<bool>(GetValue(s_isLineEnabledProperty));
+            }
+            void set(bool value)
+            {
+                SetValue(s_isLineEnabledProperty, value);
+            }
+        }
+
+#pragma endregion
+
 #pragma region Key Graph Features
 
 
@@ -422,6 +445,7 @@ namespace GraphControl
     private:
         static Windows::UI::Xaml::DependencyProperty ^ s_expressionProperty;
         static Windows::UI::Xaml::DependencyProperty ^ s_lineColorProperty;
+        static Windows::UI::Xaml::DependencyProperty ^ s_isLineEnabledProperty;
         static Windows::UI::Xaml::DependencyProperty ^ s_xInterceptProperty;
         static Windows::UI::Xaml::DependencyProperty ^ s_yInterceptProperty;
         static Windows::UI::Xaml::DependencyProperty ^ s_parityProperty;

src/GraphControl/Control/EquationCollection.h

@@ -148,6 +148,7 @@ public
 
         event EquationChangedEventHandler ^ EquationChanged;
         event EquationChangedEventHandler ^ EquationStyleChanged;
+        event EquationChangedEventHandler ^ EquationLineEnabledChanged;
 
     private:
         void OnEquationPropertyChanged(GraphControl::Equation ^, Platform::String ^ propertyName)
@@ -160,8 +161,12 @@ public
             {
                 EquationChanged();
             }
+            else if (propertyName == EquationProperties::IsLineEnabled)
+            {
+                EquationLineEnabledChanged();
+            }
         }
-      
+
     private:
         Platform::Collections::Vector<GraphControl::Equation ^> ^ m_vector;
         std::vector<Windows::Foundation::EventRegistrationToken> m_tokens;