DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Gradient picker - Updated design

Browse Source 
Color picker - Fixed opacity slider
This commit is contained in:
SpoinkyNL 2020-06-11 00:10:03 +02:00
parent 2493c2cbf1
commit c60ae48e66
6 changed files with 211 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Artemis.UI.Shared/Controls/ColorPicker.xaml
View File

@ -9,26 +9,12 @@
d:DesignHeight="101.848" d:DesignWidth="242.956"> d:DesignHeight="101.848" d:DesignWidth="242.956">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Artemis.UI.Shared;component/Resources/ArtemisShared.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ColorPicker.xaml" />
</ResourceDictionary.MergedDictionaries>
<converters:ColorToStringConverter x:Key="ColorToStringConverter" /> <converters:ColorToStringConverter x:Key="ColorToStringConverter" />
<converters:ColorToSolidColorConverter x:Key="ColorToSolidColorConverter" /> <converters:ColorToSolidColorConverter x:Key="ColorToSolidColorConverter" />
<VisualBrush x:Key="Checkerboard" TileMode="Tile" Stretch="Uniform" ViewportUnits="Absolute" Viewport="0,0,10,10">
<VisualBrush.Visual>
<Grid Width="10" Height="10">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Rectangle Grid.Row="0" Grid.Column="0" Fill="Gray" />
<Rectangle Grid.Row="0" Grid.Column="1" Fill="White" />
<Rectangle Grid.Row="1" Grid.Column="0" Fill="White" />
<Rectangle Grid.Row="1" Grid.Column="1" Fill="Gray" />
</Grid>
</VisualBrush.Visual>
</VisualBrush>
<ControlTemplate x:Key="MaterialDesignOpacitySlider" TargetType="{x:Type Slider}"> <ControlTemplate x:Key="MaterialDesignOpacitySlider" TargetType="{x:Type Slider}">
<Border <Border
x:Name="border" x:Name="border"

22
src/Artemis.UI.Shared/Resources/ArtemisShared.xaml Normal file
View File

@ -0,0 +1,22 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Artemis.UI.Shared.Resources">
<VisualBrush x:Key="Checkerboard" TileMode="Tile" Stretch="Uniform" ViewportUnits="Absolute" Viewport="0,0,10,10">
<VisualBrush.Visual>
<Grid Width="10" Height="10">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Rectangle Grid.Row="0" Grid.Column="0" Fill="Gray" />
<Rectangle Grid.Row="0" Grid.Column="1" Fill="White" />
<Rectangle Grid.Row="1" Grid.Column="0" Fill="White" />
<Rectangle Grid.Row="1" Grid.Column="1" Fill="Gray" />
</Grid>
</VisualBrush.Visual>
</VisualBrush>
</ResourceDictionary>

91
src/Artemis.UI.Shared/Screens/GradientEditor/ColorStopView.xaml
View File

@ -12,43 +12,48 @@
d:DesignHeight="450" d:DesignWidth="800" d:DesignHeight="450" d:DesignWidth="800"
d:DataContext="{d:DesignInstance local:ColorStopViewModel}" Opacity="1"> d:DataContext="{d:DesignInstance local:ColorStopViewModel}" Opacity="1">
<UserControl.Resources> <UserControl.Resources>
<converters:SKColorToColorConverter x:Key="SKColorToColorConverter" /> <ResourceDictionary>
<Style TargetType="Path" x:Key="ColorStopStyle"> <ResourceDictionary.MergedDictionaries>
<Style.Triggers> <ResourceDictionary Source="pack://application:,,,/Artemis.UI.Shared;component/Resources/ArtemisShared.xaml" />
<DataTrigger Binding="{Binding WillRemoveColorStop}" Value="True"> </ResourceDictionary.MergedDictionaries>
<DataTrigger.EnterActions> <converters:SKColorToColorConverter x:Key="SKColorToColorConverter" />
<BeginStoryboard> <Style TargetType="Path" x:Key="ColorStopStyle">
<Storyboard TargetProperty="Opacity"> <Style.Triggers>
<DoubleAnimation From="1" To="0" Duration="0:0:0.1" /> <DataTrigger Binding="{Binding WillRemoveColorStop}" Value="True">
</Storyboard> <DataTrigger.EnterActions>
</BeginStoryboard> <BeginStoryboard>
</DataTrigger.EnterActions> <Storyboard TargetProperty="Opacity">
<DataTrigger.ExitActions> <DoubleAnimation From="1" To="0" Duration="0:0:0.1" />
<BeginStoryboard> </Storyboard>
<Storyboard TargetProperty="Opacity"> </BeginStoryboard>
<DoubleAnimation From="0" To="1" Duration="0:0:0.2" /> </DataTrigger.EnterActions>
</Storyboard> <DataTrigger.ExitActions>
</BeginStoryboard> <BeginStoryboard>
</DataTrigger.ExitActions> <Storyboard TargetProperty="Opacity">
</DataTrigger> <DoubleAnimation From="0" To="1" Duration="0:0:0.2" />
<DataTrigger Binding="{Binding IsSelected}" Value="True"> </Storyboard>
<DataTrigger.EnterActions> </BeginStoryboard>
<BeginStoryboard> </DataTrigger.ExitActions>
<Storyboard TargetProperty="StrokeThickness"> </DataTrigger>
<DoubleAnimation To="2" Duration="0:0:0.1" /> <DataTrigger Binding="{Binding IsSelected}" Value="True">
</Storyboard> <DataTrigger.EnterActions>
</BeginStoryboard> <BeginStoryboard>
</DataTrigger.EnterActions> <Storyboard TargetProperty="StrokeThickness">
<DataTrigger.ExitActions> <DoubleAnimation To="2" Duration="0:0:0.1" />
<BeginStoryboard> </Storyboard>
<Storyboard TargetProperty="StrokeThickness"> </BeginStoryboard>
<DoubleAnimation To="1" Duration="0:0:0.1" /> </DataTrigger.EnterActions>
</Storyboard> <DataTrigger.ExitActions>
</BeginStoryboard> <BeginStoryboard>
</DataTrigger.ExitActions> <Storyboard TargetProperty="StrokeThickness">
</DataTrigger> <DoubleAnimation To="1" Duration="0:0:0.1" />
</Style.Triggers> </Storyboard>
</Style> </BeginStoryboard>
</DataTrigger.ExitActions>
</DataTrigger>
</Style.Triggers>
</Style>
</ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<Path Style="{StaticResource ColorStopStyle}" <Path Style="{StaticResource ColorStopStyle}"
Data="M13.437011,33.065002 C9.7268463,29.334181 7.812011,26.379009 4.874511,23.379009 1.687011,19.566509 0.12600673,17.206803 5.6843419E-14,14.127608 0.062010996,2.0027046 11.158781,-0.062991121 13.43702,0.0014351187 M13.438011,33.065016 C17.148173,29.334199 19.063008,26.379023 22.00051,23.379017 25.188007,19.566519 26.749013,17.206806 26.875018,14.127613 26.813007,2.002704 15.716239,-0.062987381 13.438,0.0014388781" Data="M13.437011,33.065002 C9.7268463,29.334181 7.812011,26.379009 4.874511,23.379009 1.687011,19.566509 0.12600673,17.206803 5.6843419E-14,14.127608 0.062010996,2.0027046 11.158781,-0.062991121 13.43702,0.0014351187 M13.438011,33.065016 C17.148173,29.334199 19.063008,26.379023 22.00051,23.379017 25.188007,19.566519 26.749013,17.206806 26.875018,14.127613 26.813007,2.002704 15.716239,-0.062987381 13.438,0.0014388781"
@ -59,7 +64,17 @@
MouseUp="{s:Action StopMouseUp}" MouseUp="{s:Action StopMouseUp}"
MouseMove="{s:Action StopMouseMove}"> MouseMove="{s:Action StopMouseMove}">
<Path.Fill> <Path.Fill>
<SolidColorBrush Color="{Binding Path=ColorStop.Color, Converter={StaticResource SKColorToColorConverter}}" /> <VisualBrush>
<VisualBrush.Visual>
<Border Background="{StaticResource Checkerboard}">
<Rectangle Width="15" Height="20">
<Rectangle.Fill>
<SolidColorBrush Color="{Binding Path=ColorStop.Color, Converter={StaticResource SKColorToColorConverter}}" />
</Rectangle.Fill>
</Rectangle>
</Border>
</VisualBrush.Visual>
</VisualBrush>
</Path.Fill> </Path.Fill>
<Path.RenderTransform> <Path.RenderTransform>
<TransformGroup> <TransformGroup>

170
src/Artemis.UI.Shared/Screens/GradientEditor/GradientEditorView.xaml
View File

@ -7,123 +7,131 @@
xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions" xmlns:controls="clr-namespace:MaterialDesignExtensions.Controls;assembly=MaterialDesignExtensions"
xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters" xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:shared="clr-namespace:Artemis.UI.Shared"
xmlns:s="https://github.com/canton7/Stylet" xmlns:s="https://github.com/canton7/Stylet"
xmlns:controls1="clr-namespace:Artemis.UI.Shared.Controls" xmlns:controls1="clr-namespace:Artemis.UI.Shared.Controls"
xmlns:utilities="clr-namespace:Artemis.UI.Shared.Utilities" xmlns:utilities="clr-namespace:Artemis.UI.Shared.Utilities"
mc:Ignorable="d" mc:Ignorable="d"
Background="{DynamicResource MaterialDesignPaper}" Background="{DynamicResource MaterialDesignPaper}"
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto" FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
Width="500" Width="400"
Height="500" Height="400"
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
d:DataContext="{d:DesignInstance local:GradientEditorViewModel}"> d:DataContext="{d:DesignInstance local:GradientEditorViewModel}">
<UserControl.Resources> <UserControl.Resources>
<converters:ColorGradientToGradientStopsConverter x:Key="ColorGradientToGradientStopsConverter" /> <converters:ColorGradientToGradientStopsConverter x:Key="ColorGradientToGradientStopsConverter" />
<converters:SKColorToColorConverter x:Key="SKColorToColorConverter" /> <converters:SKColorToColorConverter x:Key="SKColorToColorConverter" />
<VisualBrush x:Key="Checkerboard" TileMode="Tile" Stretch="Uniform" ViewportUnits="Absolute" Viewport="0,0,10,10">
<VisualBrush.Visual>
<Grid Width="10" Height="10">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Rectangle Grid.Row="0" Grid.Column="0" Fill="Gray" />
<Rectangle Grid.Row="0" Grid.Column="1" Fill="White" />
<Rectangle Grid.Row="1" Grid.Column="0" Fill="White" />
<Rectangle Grid.Row="1" Grid.Column="1" Fill="Gray" />
</Grid>
</VisualBrush.Visual>
</VisualBrush>
</UserControl.Resources> </UserControl.Resources>
<Grid Margin="16"> <Grid Margin="16">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<materialDesign:Card Grid.Row="0" Margin="15 15 15 7"> <StackPanel Grid.Row="0" Margin="0 5" HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="16"> <materialDesign:PackIcon Kind="Crane" Width="80" Height="80" HorizontalAlignment="Center" />
<materialDesign:PackIcon Kind="Crane" Width="80" Height="80" HorizontalAlignment="Center" /> <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center">
<TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" TextWrapping="Wrap" Gradient saving not implemented yet
HorizontalAlignment="Center"> </TextBlock>
Gradient saving not implemented yet <TextBlock Style="{StaticResource MaterialDesignCaptionTextBlock}" TextWrapping="Wrap" HorizontalAlignment="Center">
</TextBlock> Soon you'll be able to store different gradients for usage throughout your profiles and quickly select them
<TextBlock Style="{StaticResource MaterialDesignCaptionTextBlock}" TextWrapping="Wrap" </TextBlock>
HorizontalAlignment="Center"> </StackPanel>
Soon you'll be able to store different gradients for usage throughout your profiles and quickly select them <Separator Grid.Row="1" Margin="0 5" />
</TextBlock> <StackPanel Grid.Row="2" Margin="0 5" ClipToBounds="False">
</StackPanel> <TextBlock Margin="0 5">Gradient</TextBlock>
</materialDesign:Card>
<materialDesign:Card Grid.Row="1" Margin="15 7 15 15" ClipToBounds="False"> <Border Background="{StaticResource Checkerboard}">
<StackPanel ClipToBounds="False"> <Rectangle x:Name="Preview" Height="40" utilities:SizeObserver.Observe="True" utilities:SizeObserver.ObservedWidth="{Binding PreviewWidth, Mode=OneWayToSource}">
<TextBlock Margin="15 15 0 0">Gradient</TextBlock>
<Separator Margin="15 5" />
<Rectangle x:Name="Preview" Height="40" Margin="15 0"
utilities:SizeObserver.Observe="True"
utilities:SizeObserver.ObservedWidth="{Binding PreviewWidth, Mode=OneWayToSource}">
<Rectangle.Fill> <Rectangle.Fill>
<LinearGradientBrush <LinearGradientBrush
GradientStops="{Binding ColorGradient.Stops, Converter={StaticResource ColorGradientToGradientStopsConverter}}" GradientStops="{Binding ColorGradient.Stops, Converter={StaticResource ColorGradientToGradientStopsConverter}}"
EndPoint="1,0" EndPoint="1,0"
StartPoint="0,0"/> StartPoint="0,0" />
</Rectangle.Fill> </Rectangle.Fill>
</Rectangle> </Rectangle>
</Border>
<ItemsControl ItemsSource="{Binding ColorStopViewModels}" Margin="15 0" <ItemsControl ItemsSource="{Binding ColorStopViewModels}" MouseLeftButtonUp="{s:Action AddColorStop}" Cursor="Cross">
MouseLeftButtonUp="{s:Action AddColorStop}" Cursor="Cross"> <ItemsControl.ItemsPanel>
<ItemsControl.ItemsPanel> <ItemsPanelTemplate>
<ItemsPanelTemplate> <Canvas Height="16" Width="440" x:Name="PreviewCanvas" Background="Transparent" />
<Canvas Height="16" Width="440" x:Name="PreviewCanvas" Background="Transparent" /> </ItemsPanelTemplate>
</ItemsPanelTemplate> </ItemsControl.ItemsPanel>
</ItemsControl.ItemsPanel> <ItemsControl.ItemContainerStyle>
<ItemsControl.ItemContainerStyle> <Style TargetType="ContentPresenter">
<Style TargetType="ContentPresenter"> <Setter Property="Canvas.Left" Value="{Binding Offset}" />
<Setter Property="Canvas.Left" Value="{Binding Offset}" /> </Style>
</Style> </ItemsControl.ItemContainerStyle>
</ItemsControl.ItemContainerStyle> <ItemsControl.ItemTemplate>
<ItemsControl.ItemTemplate> <DataTemplate>
<DataTemplate> <ContentControl s:View.Model="{Binding}" />
<ContentControl s:View.Model="{Binding}" /> </DataTemplate>
</DataTemplate> </ItemsControl.ItemTemplate>
</ItemsControl.ItemTemplate> </ItemsControl>
</ItemsControl>
<TextBlock Margin="15 15 0 0">Selected stop</TextBlock> <TextBlock Margin="0 5">Selected stop</TextBlock>
<Separator Margin="15 5" />
<Grid Margin="15"> <Grid Margin="0 5">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="70" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="70" /> </Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="140" />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" HorizontalAlignment="Right">Color:</Label> <StackPanel Grid.Column="0" Orientation="Horizontal">
<Label HorizontalAlignment="Left" Margin="-5,0,0,0">Color:</Label>
<controls1:ColorPicker <controls1:ColorPicker
Grid.Row="0"
Grid.Column="1"
x:Name="CurrentColor" x:Name="CurrentColor"
Width="85" Width="85"
Margin="5,0,15,0"
Color="{Binding Path=SelectedColorStopViewModel.ColorStop.Color, Converter={StaticResource SKColorToColorConverter}}" Color="{Binding Path=SelectedColorStopViewModel.ColorStop.Color, Converter={StaticResource SKColorToColorConverter}}"
IsEnabled="{Binding HasSelectedColorStopViewModel}" /> IsEnabled="{Binding HasSelectedColorStopViewModel}" />
<Label Grid.Row="0" Grid.Column="2" HorizontalAlignment="Right">Location:</Label> <Label HorizontalAlignment="Center">Location:</Label>
<StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal"> <TextBox Width="40"
<TextBox Width="40" Text="{Binding SelectedColorStopViewModel.OffsetPercent}" Text="{Binding SelectedColorStopViewModel.OffsetPercent}"
IsEnabled="{Binding HasSelectedColorStopViewModel}" materialDesign:HintAssist.Hint="0" /> IsEnabled="{Binding HasSelectedColorStopViewModel}"
<Label>%</Label> materialDesign:HintAssist.Hint="0"
</StackPanel> Margin="5 0 0 0" />
<Label>%</Label>
</StackPanel>
<Button Grid.Column="1"
Style="{StaticResource MaterialDesignOutlinedButton}"
Height="25"
Margin="8,0,0,0"
IsEnabled="{Binding HasSelectedColorStopViewModel}"
Command="{s:Action RemoveColorStop}"
CommandParameter="{Binding SelectedColorStopViewModel}">
DELETE
</Button>
</Grid>
</StackPanel>
<Button Grid.Row="0" Grid.Column="4" <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
Style="{StaticResource MaterialDesignRaisedButton}" <Button Style="{StaticResource MaterialDesignOutlinedButton}" IsCancel="True" Margin="0 8 8 0"
Width="80" Command="{s:Action Cancel}" Content="CANCEL" />
Height="25" <Button Style="{StaticResource MaterialDesignFlatMidBgButton}" IsDefault="True" Margin="0 8 0 0"
IsEnabled="{Binding HasSelectedColorStopViewModel}" Command="{s:Action Confirm}" Content="ACCEPT" />
Command="{s:Action RemoveColorStop}"
CommandParameter="{Binding SelectedColorStopViewModel}">
Delete
</Button>
</Grid>
</StackPanel>
</materialDesign:Card>
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
<Button Style="{StaticResource MaterialDesignFlatButton}" IsCancel="True" Margin="0 8 8 0"
Command="{s:Action Cancel}" Content="Cancel" />
<Button Style="{StaticResource MaterialDesignFlatButton}" IsDefault="True" Margin="0 8 0 0"
Command="{s:Action Confirm}" Content="Accept" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

52
src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml
View File

@ -36,7 +36,7 @@
<ScrollBar Name="PART_VerticalScrollBar" <ScrollBar Name="PART_VerticalScrollBar"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Opacity="0.5" Opacity="0.5"
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Value="{TemplateBinding VerticalOffset}" Value="{TemplateBinding VerticalOffset}"
Maximum="{TemplateBinding ScrollableHeight}" Maximum="{TemplateBinding ScrollableHeight}"
@ -46,7 +46,7 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Orientation="Horizontal" Orientation="Horizontal"
Opacity="0.5" Opacity="0.5"
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Value="{TemplateBinding HorizontalOffset}" Value="{TemplateBinding HorizontalOffset}"
Maximum="{TemplateBinding ScrollableWidth}" Maximum="{TemplateBinding ScrollableWidth}"
@ -190,21 +190,53 @@
</Grid> </Grid>
<!-- Bottom row, a bit hacky but has a ZIndex of 2 to cut off the time caret that overlaps the entire timeline --> <!-- Bottom row, a bit hacky but has a ZIndex of 2 to cut off the time caret that overlaps the entire timeline -->
<StackPanel Grid.Row="1" <Grid Grid.Row="1"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
ZIndex="2" ZIndex="2"
Background="{DynamicResource MaterialDesignCardBackground}"> Background="{DynamicResource MaterialDesignCardBackground}">
<!-- Selected layer controls -->
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="6">
<materialDesign:PackIcon Kind="Layers" Width="16" />
<materialDesign:PackIcon Kind="{Binding SelectedLayer.LayerBrush.Descriptor.Icon}"
Width="16"
Margin="5 0 0 0"
ToolTip="{Binding SelectedLayer.LayerBrush.Descriptor.DisplayName, Mode=OneWay}"
Background="Transparent" />
<TextBlock Text="{Binding SelectedLayer.Name}" Margin="5 0 0 0" />
</StackPanel>
<Button Grid.Column="1"
Style="{StaticResource MaterialDesignFlatMidBgButton}"
Margin="0 -2"
Padding="10 0"
Height="20"
Width="82"
ToolTip="Change the property's data binding"
VerticalAlignment="Center">
<TextBlock FontSize="10">ADD EFFECT</TextBlock>
</Button>
</Grid>
<!-- Zoom control --> <!-- Zoom control -->
<Slider Orientation="Horizontal" <Slider Grid.Column="1"
Orientation="Horizontal"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="10 5" Margin="10 5"
Minimum="31" Minimum="31"
Maximum="350" Maximum="350"
Value="{Binding ProfileEditorService.PixelsPerSecond}" Value="{Binding ProfileEditorService.PixelsPerSecond}"
Width="319" /> Width="319" />
</StackPanel> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>

2
src/Artemis.UI/Screens/Module/ProfileEditor/ProfileEditorView.xaml
View File

@ -45,7 +45,7 @@
<!-- Bottom panels resize --> <!-- Bottom panels resize -->
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<!-- Bottom panels --> <!-- Bottom panels -->
<RowDefinition Height="{Binding BottomPanelsHeight.Value, Mode=TwoWay}" MinHeight="100" /> <RowDefinition Height="{Binding BottomPanelsHeight.Value, Mode=TwoWay}" MinHeight="108" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- Introduction --> <!-- Introduction -->