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

Fixed color picker button

Browse Source
This commit is contained in:
Robert 2023-04-04 22:36:39 +02:00
parent 0116bac346
commit 73933ee324
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Artemis.UI.Shared/Styles/ColorPickerButton.axaml
View File

@ -2,14 +2,17 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia">
<Design.PreviewWith>
<Border Padding="20">
<Grid Height="24" ColumnDefinitions="*">
<Border Padding="20" Width="600" Height="600">
<Grid Height="24" ColumnDefinitions="*" Width="200">
<TextBox Classes="condensed"
Text="#FFFF0000"
Padding="2 2 30 2">
Padding="2 2 30 2"
>
</TextBox>
<controls:ColorPickerButton Classes="contained-color-picker-button"
ShowAcceptDismissButtons="False" />
Color="Red"
ShowAcceptDismissButtons="False"
/>
</Grid>
</Border>
</Design.PreviewWith>
@ -25,23 +28,21 @@
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<Button Name="MainButton"
Padding="0"
BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}">
<ControlTemplate>
<Button Name="ShowFlyoutButton"
CornerRadius="{TemplateBinding CornerRadius}"
HorizontalContentAlignment="Stretch"
Padding="0">
<Grid ColumnDefinitions="*,Auto">
<Border BorderBrush="{DynamicResource ColorPickerButtonOutline}"
BorderThickness="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
MinWidth="18" MinHeight="18"
Background="{TemplateBinding Color, Converter={StaticResource ColorBrushConv}}"
CornerRadius="{TemplateBinding CornerRadius}">
<controls:FAColorPicker Name="ColorPicker" IsVisible="False" />
</Border>
</Button>
</ControlTemplate>
</Setter.Value>
CornerRadius="{TemplateBinding CornerRadius}"/>
</Grid>
</Button>
</ControlTemplate>
</Setter>
</Style>

3
src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml
View File

@ -14,7 +14,7 @@
<shared:SKColorToColorConverter x:Key="SKColorToColorConverter" />
</UserControl.Resources>
<Grid Height="24" ColumnDefinitions="*">
<TextBox Classes="condensed" Padding="2 2 30 2" FontFamily="Consolas">
<TextBox Classes="condensed" Padding="2 2 30 2">
<Interaction.Behaviors>
<behaviors:LostFocusTextBoxBindingBehavior Text="{CompiledBinding InputValue, Converter={StaticResource SKColorToStringConverter}}" />
</Interaction.Behaviors>
@ -22,6 +22,7 @@
<controls:ColorPickerButton Classes="contained-color-picker-button"
Color="{CompiledBinding InputValue, Converter={StaticResource SKColorToColorConverter}}"
ShowAcceptDismissButtons="False"
FlyoutPlacement="Right"
FlyoutOpened="ColorPickerButton_OnFlyoutOpened"
FlyoutClosed="ColorPickerButton_OnFlyoutClosed" />
</Grid>

4
src/Artemis.UI/Screens/Settings/Updating/ReleaseView.axaml
View File

@ -156,9 +156,7 @@
<TextBlock Grid.Row="0" Classes="h5 no-margin">Release notes</TextBlock>
<Separator Grid.Row="1" Classes="card-separator" />
<avalonia:MarkdownScrollViewer Grid.Row="2" Markdown="{CompiledBinding Changelog}">
</avalonia:MarkdownScrollViewer>
<avalonia:MarkdownScrollViewer Grid.Row="2" Markdown="{CompiledBinding Changelog}" MarkdownStyleName="FluentAvalonia"/>
</Grid>
</Border>
</Grid>