diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-06-20 18:29:55 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2022-06-20 18:29:55 +0300 |
| commit | c0f4cccfd536f94946f22a2fafa630a446d85b0a (patch) | |
| tree | df4a853fbfb8ba2d6af8d90f504b36dd041e198e /Software | |
| parent | c9a2f44f2ef91e1db66119cfb50b32cdddafc28c (diff) | |
| download | Tango-c0f4cccfd536f94946f22a2fafa630a446d85b0a.tar.gz Tango-c0f4cccfd536f94946f22a2fafa630a446d85b0a.zip | |
PPC. Color Selection Dialog. A little changes in GUI.
Related Work Items: #6727, #6731
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml | 21 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Touch/Styles/TouchToggleButton.xaml | 20 |
2 files changed, 25 insertions, 16 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml index 27da4ab07..0eda28e5f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml @@ -57,7 +57,7 @@ </Style> <DataTemplate x:Key="brushColorPanel"> - <Grid Height="180" Margin="93 10 0 0" HorizontalAlignment="Stretch"> + <Grid Height="180" Margin="83 10 0 0" HorizontalAlignment="Stretch"> <Grid.ColumnDefinitions> <ColumnDefinition Width="1*"/> <ColumnDefinition Width="270"/> @@ -139,21 +139,10 @@ <Canvas Grid.Column="1" Width="28" Height="28" VerticalAlignment="Top" HorizontalAlignment="Left"> <touch:TouchToggleButton Canvas.Left="0" Canvas.Top="0" x:Name="addColorToGroup" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}" Background="Transparent" BorderThickness="0" Command="{Binding SaveMyColorsCommand}" - IsEnabled="{Binding SelectedBrushStop.IsLiquidVolumesOutOfRange, Converter={StaticResource BooleanInverseConverter}}"> - <touch:TouchToggleButton.Style > - <Style TargetType="touch:TouchToggleButton" > - <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/> - <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"/> - <Style.Triggers> - <Trigger Property="IsEnabled" Value="False"> - <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter> - <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter> - </Trigger> - </Style.Triggers> - </Style> - </touch:TouchToggleButton.Style> + IsEnabled="{Binding SelectedBrushStop.IsLiquidVolumesOutOfRange, Converter={StaticResource BooleanInverseConverter}}" Style="{StaticResource TangoTouchToggleButtonNoDisable}"> + <Border Height="26" Width="28" BorderThickness="0" BorderBrush="{StaticResource TangoKeyboardKeyDarkBrush}" Background="Transparent" HorizontalAlignment="Left"> - <Image Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"> + <Image Stretch="Fill" RenderOptions.BitmapScalingMode="Fant" > <Image.Style> <Style TargetType="{x:Type Image}"> <Setter Property="Source" Value="../Images/ColorSelection/Heart.png" /> @@ -162,7 +151,7 @@ <Setter Property="Source" Value="../Images/ColorSelection/fillheart.png"/> </DataTrigger> <DataTrigger Binding="{Binding SelectedBrushStop.IsLiquidVolumesOutOfRange}" Value="True"> - <Setter Property="Source" Value="../Images/ColorSelection/Heart_disable.png"/> + <Setter Property="Source" Value="../Images/ColorSelection/Heart.png"/> </DataTrigger> </Style.Triggers> </Style> diff --git a/Software/Visual_Studio/Tango.Touch/Styles/TouchToggleButton.xaml b/Software/Visual_Studio/Tango.Touch/Styles/TouchToggleButton.xaml index edf25c256..8f4134d02 100644 --- a/Software/Visual_Studio/Tango.Touch/Styles/TouchToggleButton.xaml +++ b/Software/Visual_Studio/Tango.Touch/Styles/TouchToggleButton.xaml @@ -4,6 +4,12 @@ xmlns:components="clr-namespace:Tango.Touch.Components" xmlns:local="clr-namespace:Tango.Touch.Styles"> + <ResourceDictionary.MergedDictionaries> + <ResourceDictionary Source="../Resources/Colors.xaml" /> + <ResourceDictionary Source="../Resources/Fonts.xaml" /> + <ResourceDictionary Source="../Controls/TouchToggleButton.xaml" /> + </ResourceDictionary.MergedDictionaries> + <Style x:Key="TangoTouchToggleButtonHamburger" TargetType="{x:Type controls:TouchToggleButton}"> <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}"/> <Setter Property="Background" Value="Transparent" /> @@ -193,4 +199,18 @@ </Setter.Value> </Setter> </Style> + + <Style x:Key="TangoTouchToggleButtonNoDisable" TargetType="{x:Type controls:TouchToggleButton}"> + <Setter Property="Template"> + <Setter.Value> + <ControlTemplate TargetType="{x:Type controls:TouchToggleButton}"> + <Border x:Name="border" Style="{StaticResource DropShadowBorder}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{TemplateBinding CornerRadius}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true"> + <components:Ripple CornerRadius="{TemplateBinding CornerRadius}" RippleBrush="{TemplateBinding RippleBrush}"> + <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> + </components:Ripple> + </Border> + </ControlTemplate> + </Setter.Value> + </Setter> + </Style> </ResourceDictionary>
\ No newline at end of file |