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 editor - Move bottom-margin away from induvidual buttons

Browse Source
This commit is contained in:
Robert 2021-05-03 11:44:16 +02:00
parent 695a3a6867
commit a93b52333c
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@
</VisualBrush> </VisualBrush>
</UserControl.Resources> </UserControl.Resources>
<UserControl.InputBindings> <UserControl.InputBindings>
<KeyBinding Key="Delete" Command="{s:Action RemoveColorStop}" CommandParameter="{Binding SelectedColorStopViewModel}"/> <KeyBinding Key="Delete" Command="{s:Action RemoveColorStop}" CommandParameter="{Binding SelectedColorStopViewModel}" />
</UserControl.InputBindings> </UserControl.InputBindings>
<Grid Margin="16"> <Grid Margin="16">
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -60,55 +60,59 @@
</StackPanel> </StackPanel>
<Separator Grid.Row="1" Margin="0 5" /> <Separator Grid.Row="1" Margin="0 5" />
<StackPanel Grid.Row="2" Margin="0 5" ClipToBounds="False"> <StackPanel Grid.Row="2" Margin="0 5" ClipToBounds="False">
<Grid> <Grid Margin="0 0 0 5">
<TextBlock Margin="0 5">Gradient</TextBlock> <TextBlock Margin="0 5" VerticalAlignment="Center">Gradient</TextBlock>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center">
<Button Style="{StaticResource MaterialDesignFlatButton}" <Button Style="{StaticResource MaterialDesignFlatButton}"
Margin="0 0 5 4" Margin="0 0 5 0"
Padding="0" Padding="0"
Command="{s:Action SpreadColorStops}" Command="{s:Action SpreadColorStops}"
ToolTip="Spread Stops" IsEnabled="{Binding HasMoreThanOneStop}" ToolTip="Spread Stops"
HorizontalAlignment="Left" IsEnabled="{Binding HasMoreThanOneStop}"
Height="25" Width="25"> HorizontalAlignment="Left"
<materialDesign:PackIcon Kind="ArrowLeftRight"/> Height="25" Width="25">
<materialDesign:PackIcon Kind="ArrowLeftRight" />
</Button> </Button>
<Button Style="{StaticResource MaterialDesignFlatButton}" <Button Style="{StaticResource MaterialDesignFlatButton}"
Margin="0 0 5 4" Margin="0 0 5 0"
Padding="0" Padding="0"
Command="{s:Action ToggleSeam}" Command="{s:Action ToggleSeam}"
ToolTip="Toggle Seamless" IsEnabled="{Binding HasMoreThanOneStop}" ToolTip="Toggle Seamless"
HorizontalAlignment="Left" IsEnabled="{Binding HasMoreThanOneStop}"
Height="25" Width="25"> HorizontalAlignment="Left"
<materialDesign:PackIcon Kind="SineWave"/> Height="25" Width="25">
<materialDesign:PackIcon Kind="SineWave" />
</Button> </Button>
<Button Style="{StaticResource MaterialDesignFlatButton}" <Button Style="{StaticResource MaterialDesignFlatButton}"
Margin="0 0 5 4" Margin="0 0 5 0"
Padding="0" Padding="0"
Command="{s:Action FlipColorStops}" Command="{s:Action FlipColorStops}"
ToolTip="Flip Stops" IsEnabled="{Binding HasMoreThanOneStop}" ToolTip="Flip Stops"
HorizontalAlignment="Left" IsEnabled="{Binding HasMoreThanOneStop}"
Height="25" Width="25"> HorizontalAlignment="Left"
<materialDesign:PackIcon Kind="FlipHorizontal"/> Height="25" Width="25">
<materialDesign:PackIcon Kind="FlipHorizontal" />
</Button> </Button>
<Button Style="{StaticResource MaterialDesignFlatButton}" <Button Style="{StaticResource MaterialDesignFlatButton}"
Margin="0 0 5 4" Margin="0 0 5 0"
Padding="0" Padding="0"
Command="{s:Action RotateColorStops}" Command="{s:Action RotateColorStops}"
ToolTip="Rotate Stops (shift to invert)" IsEnabled="{Binding HasMoreThanOneStop}" ToolTip="Rotate Stops (shift to invert)"
HorizontalAlignment="Left" IsEnabled="{Binding HasMoreThanOneStop}"
Height="25" Width="25"> HorizontalAlignment="Left"
<materialDesign:PackIcon Kind="AxisZRotateCounterclockwise"/> Height="25" Width="25">
<materialDesign:PackIcon Kind="AxisZRotateCounterclockwise" />
</Button> </Button>
<Button Style="{StaticResource MaterialDesignFlatButton}" <Button Style="{StaticResource MaterialDesignFlatButton}"
Margin="0 0 5 4" Padding="0"
Padding="0" Command="{s:Action ShowClearGradientPopup}"
Command="{s:Action ShowClearGradientPopup}" ToolTip="Clear All Color Stops"
ToolTip="Clear All Color Stops" IsEnabled="{Binding HasMoreThanOneStop}" IsEnabled="{Binding HasMoreThanOneStop}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Height="25" Width="25" Height="25" Width="25"
x:Name="ClearGradientButton"> x:Name="ClearGradientButton">
<StackPanel> <StackPanel>
<materialDesign:PackIcon Kind="DeleteSweep"/> <materialDesign:PackIcon Kind="DeleteSweep" />
</StackPanel> </StackPanel>
</Button> </Button>
<Popup <Popup
@ -121,7 +125,7 @@
StaysOpen="False" StaysOpen="False"
PopupAnimation="Fade" PopupAnimation="Fade"
IsOpen="{Binding ClearGradientPopupOpen, Mode=OneWay}"> IsOpen="{Binding ClearGradientPopupOpen, Mode=OneWay}">
<materialDesign:Card Margin="30" Padding="12" materialDesign:ShadowAssist.ShadowDepth="Depth4" > <materialDesign:Card Margin="30" Padding="12" materialDesign:ShadowAssist.ShadowDepth="Depth4">
<StackPanel HorizontalAlignment="Center"> <StackPanel HorizontalAlignment="Center">
<TextBlock Style="{StaticResource MaterialDesignSubtitle2TextBlock}" TextAlignment="Center" Margin="0 0 0 10">Clear Gradient?</TextBlock> <TextBlock Style="{StaticResource MaterialDesignSubtitle2TextBlock}" TextAlignment="Center" Margin="0 0 0 10">Clear Gradient?</TextBlock>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -195,10 +199,10 @@
CommandParameter="{Binding SelectedColorStopViewModel}" CommandParameter="{Binding SelectedColorStopViewModel}"
ToolTip="Delete Selected Stop"> ToolTip="Delete Selected Stop">
<Button.Resources> <Button.Resources>
<SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#c94848"/> <SolidColorBrush x:Key="PrimaryHueMidBrush" Color="#c94848" />
</Button.Resources> </Button.Resources>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Delete"/> <materialDesign:PackIcon Kind="Delete" />
<TextBlock Margin="4 0 0 0">Delete</TextBlock> <TextBlock Margin="4 0 0 0">Delete</TextBlock>
</StackPanel> </StackPanel>
</Button> </Button>