Add variable editing (#581)
This commit is contained in:
Pepe Rivera
GitHub
@@ -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:graphControl="using:GraphControl"
|
||||
xmlns:local="using:CalculatorApp"
|
||||
@@ -10,6 +11,11 @@
|
||||
DataContextChanged="GraphingCalculator_DataContextChanged"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<UserControl.Resources>
|
||||
<converters:BooleanToVisibilityConverter x:Name="BooleanToVisibilityConverter"/>
|
||||
<converters:BooleanToVisibilityNegationConverter x:Name="BooleanToVisibilityNegationConverter"/>
|
||||
</UserControl.Resources>
|
||||
|
||||
<Grid x:Name="RootGrid">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition x:Name="RowHamburger" Height="{StaticResource HamburgerHeightGridLength}"/>
|
||||
@@ -25,11 +31,12 @@
|
||||
Grid.Row="1"
|
||||
Grid.Column="0">
|
||||
|
||||
<graphControl:Grapher Grid.Row="0"
|
||||
<graphControl:Grapher Name="GraphingControl"
|
||||
Margin="4,7,4,4"
|
||||
EquationsSource="{x:Bind ViewModel.Equations, Mode=OneWay}"
|
||||
ForceProportionalAxes="True"
|
||||
UseSystemFocusVisuals="True">
|
||||
UseSystemFocusVisuals="True"
|
||||
VariablesUpdated="GraphVariablesUpdated">
|
||||
<graphControl:Grapher.Background>
|
||||
<SolidColorBrush Color="White"/>
|
||||
</graphControl:Grapher.Background>
|
||||
@@ -39,6 +46,175 @@
|
||||
</DataTemplate>
|
||||
</graphControl:Grapher.EquationTemplate>
|
||||
</graphControl:Grapher>
|
||||
|
||||
<!-- Temporary button until the final UI is created -->
|
||||
<Button Margin="12,0,0,12"
|
||||
VerticalAlignment="Bottom"
|
||||
FontFamily="{StaticResource SymbolThemeFontFamily}"
|
||||
FontSize="18"
|
||||
Content=""
|
||||
RequestedTheme="Light">
|
||||
<Button.Flyout>
|
||||
<Flyout Placement="TopEdgeAlignedRight">
|
||||
<Flyout.FlyoutPresenterStyle>
|
||||
<Style TargetType="FlyoutPresenter">
|
||||
<Setter Property="RequestedTheme" Value="Default"/>
|
||||
<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled"/>
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
|
||||
<Setter Property="Margin" Value="12,0,0,0"/>
|
||||
</Style>
|
||||
</Flyout.FlyoutPresenterStyle>
|
||||
<ListView x:Name="VariableListView"
|
||||
MinWidth="300"
|
||||
ItemsSource="{x:Bind ViewModel.Variables}"
|
||||
SelectionMode="None">
|
||||
<ListView.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.ThemeDictionaries>
|
||||
<ResourceDictionary x:Key="Default">
|
||||
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="TextControlForegroundFocused" Color="White"/>
|
||||
<x:Double x:Key="TextControlThemeMinWidth">32</x:Double>
|
||||
<x:Double x:Key="TextControlThemeMinHeight">16</x:Double>
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="Light">
|
||||
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="TextControlForegroundFocused" Color="Black"/>
|
||||
<x:Double x:Key="TextControlThemeMinWidth">32</x:Double>
|
||||
<x:Double x:Key="TextControlThemeMinHeight">16</x:Double>
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="HighContrast">
|
||||
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SystemColorButtonFaceColor}"/>
|
||||
<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="{StaticResource SystemColorButtonFaceColor}"/>
|
||||
<SolidColorBrush x:Key="TextControlForegroundFocused" Color="{ThemeResource SystemColorButtonTextColor}"/>
|
||||
<x:Double x:Key="TextControlThemeMinWidth">32</x:Double>
|
||||
<x:Double x:Key="TextControlThemeMinHeight">16</x:Double>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
</ResourceDictionary>
|
||||
</ListView.Resources>
|
||||
<ListView.Header>
|
||||
<TextBlock x:Uid="VaiablesHeader" Margin="0,0,0,12"/>
|
||||
</ListView.Header>
|
||||
<ListView.ItemContainerStyle>
|
||||
<Style TargetType="ListViewItem">
|
||||
<Setter Property="IsTabStop" Value="False"/>
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
||||
<Setter Property="Margin" Value="0,0,0,12"/>
|
||||
</Style>
|
||||
</ListView.ItemContainerStyle>
|
||||
|
||||
<ListView.ItemTemplate>
|
||||
<DataTemplate x:DataType="vm:VariableViewModel">
|
||||
<StackPanel>
|
||||
<Grid HorizontalAlignment="Stretch">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Padding="0,0,0,8"
|
||||
VerticalAlignment="Bottom"
|
||||
Text="{x:Bind Name}"/>
|
||||
<TextBox x:Name="ValueTextBox"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Left"
|
||||
Style="{StaticResource VariableTextBoxStyle}"
|
||||
GotFocus="TextBoxGotFocus"
|
||||
KeyDown="TextBoxKeyDown"
|
||||
LosingFocus="TextBoxLosingFocus"
|
||||
Text="{x:Bind Value, Mode=OneWay}"/>
|
||||
<ToggleButton Grid.Column="2"
|
||||
HorizontalAlignment="Right"
|
||||
Background="Transparent"
|
||||
FontFamily="{StaticResource SymbolThemeFontFamily}"
|
||||
Content=""
|
||||
IsChecked="{x:Bind SliderSettingsVisible, Mode=TwoWay}">
|
||||
<ToggleButton.Resources>
|
||||
<SolidColorBrush x:Key="ToggleButtonBackgroundPressed" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonBackgroundChecked" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPointerOver" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonBorderBrushCheckedPointerOver" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonBackgroundPointerOver" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonBorderBrushPointerOver" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonBackgroundCheckedPressed" Color="Transparent"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonForegroundPointerOver" Color="{ThemeResource SystemAccentColor}"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonForegroundPressed" Color="{ThemeResource SystemAccentColor}"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonForegroundChecked" Color="{ThemeResource SystemAccentColor}"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonForegroundCheckedPressed" Color="{ThemeResource SystemAccentColor}"/>
|
||||
<SolidColorBrush x:Key="ToggleButtonForegroundCheckedPointerOver" Color="{ThemeResource SystemAccentColor}"/>
|
||||
<x:Double x:Key="TextControlThemeMinWidth">32</x:Double>
|
||||
</ToggleButton.Resources>
|
||||
</ToggleButton>
|
||||
</Grid>
|
||||
<Slider MinHeight="38"
|
||||
Maximum="{x:Bind Max, Mode=TwoWay}"
|
||||
Minimum="{x:Bind Min, Mode=TwoWay}"
|
||||
StepFrequency="{x:Bind Step, Mode=TwoWay}"
|
||||
Visibility="{x:Bind SliderSettingsVisible, Converter={StaticResource BooleanToVisibilityNegationConverter}, Mode=OneWay}"
|
||||
Value="{x:Bind Value, Mode=TwoWay}"/>
|
||||
<Grid Grid.Row="1"
|
||||
MinHeight="38"
|
||||
HorizontalAlignment="Stretch"
|
||||
Visibility="{x:Bind SliderSettingsVisible, Converter={StaticResource BooleanToVisibilityConverter}, Mode=OneWay}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock x:Uid="MinTextBlock"
|
||||
Padding="0,0,0,8"
|
||||
VerticalAlignment="Bottom"
|
||||
FontWeight="SemiBold"/>
|
||||
<TextBox x:Name="MinTextBox"
|
||||
MaxWidth="96"
|
||||
Style="{StaticResource VariableTextBoxStyle}"
|
||||
GotFocus="TextBoxGotFocus"
|
||||
KeyDown="TextBoxKeyDown"
|
||||
LosingFocus="TextBoxLosingFocus"
|
||||
Text="{x:Bind Min, Mode=OneWay}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Column="1"
|
||||
HorizontalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock x:Uid="StepTextBlock"
|
||||
Padding="0,0,0,8"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Bottom"
|
||||
FontWeight="SemiBold"/>
|
||||
<TextBox x:Name="StepTextBox"
|
||||
MaxWidth="96"
|
||||
HorizontalAlignment="Center"
|
||||
Style="{StaticResource VariableTextBoxStyle}"
|
||||
GotFocus="TextBoxGotFocus"
|
||||
KeyDown="TextBoxKeyDown"
|
||||
LosingFocus="TextBoxLosingFocus"
|
||||
Text="{x:Bind Step, Mode=OneWay}"/>
|
||||
</StackPanel>
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal">
|
||||
<TextBlock x:Uid="MaxTextBlock"
|
||||
Padding="0,0,0,8"
|
||||
VerticalAlignment="Bottom"
|
||||
FontWeight="SemiBold"/>
|
||||
<TextBox x:Name="MaxTextBox"
|
||||
MaxWidth="96"
|
||||
Style="{StaticResource VariableTextBoxStyle}"
|
||||
GotFocus="TextBoxGotFocus"
|
||||
KeyDown="TextBoxKeyDown"
|
||||
LosingFocus="TextBoxLosingFocus"
|
||||
Text="{x:Bind Max, Mode=OneWay}"/>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListView.ItemTemplate>
|
||||
</ListView>
|
||||
</Flyout>
|
||||
</Button.Flyout>
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
<!-- Right portion of the screen -->
|
||||
@@ -50,12 +226,13 @@
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="5*"/>
|
||||
<RowDefinition Height="3*"/>
|
||||
<RowDefinition Height="3*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<local:EquationInputArea Grid.Row="0" Equations="{x:Bind ViewModel.Equations}"/>
|
||||
|
||||
<Grid x:Name="ButtonContainerGrid"
|
||||
Grid.Row="1"
|
||||
Grid.Row="2"
|
||||
Margin="3,0,3,3"
|
||||
UseLayoutRounding="False">
|
||||
<Grid.RowDefinitions>
|
||||
|
||||
Reference in New Issue
Block a user