Browse Source

Use opaque background

pull/165/head
Ionite 1 year ago
parent
commit
d69513f951
No known key found for this signature in database
  1. 6
      StabilityMatrix.Avalonia/Controls/ImageFolderCard.axaml
  2. 8
      StabilityMatrix.Avalonia/Controls/ImageGalleryCard.axaml
  3. 16
      StabilityMatrix.Avalonia/Controls/PromptCard.axaml
  4. 18
      StabilityMatrix.Avalonia/Styles/BorderStyles.axaml
  5. 6
      StabilityMatrix.Avalonia/Styles/ThemeColors.axaml

6
StabilityMatrix.Avalonia/Controls/ImageFolderCard.axaml

@ -188,19 +188,19 @@
Stretch="UniformToFill"
StretchDirection="Both" />
<ExperimentalAcrylicBorder
<Border
Grid.Row="1"
Classes="theme-dark"
MinHeight="20"
Padding="4,0,0,0"
VerticalAlignment="Bottom"
Material="{StaticResource OpaqueDarkAcrylicMaterial}"
Opacity="0.9">
<TextBlock
FontSize="12"
VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
Text="{Binding FileNameWithoutExtension}"/>
</ExperimentalAcrylicBorder>
</Border>
</Grid>
</Border>
</Button>

8
StabilityMatrix.Avalonia/Controls/ImageGalleryCard.axaml

@ -32,11 +32,11 @@
<Grid RowDefinitions="*,Auto">
<!-- Main image view -->
<ExperimentalAcrylicBorder
<Border
Classes="theme-dark"
VerticalAlignment="Stretch"
CornerRadius="4"
Margin="0,0,0,4"
Material="{StaticResource OpaqueDarkAcrylicMaterial}">
Margin="0,0,0,4">
<Grid x:Name="MainGrid">
<Grid.Styles>
<Style Selector="controls|AdvancedImageBox">
@ -96,7 +96,7 @@
</Border>
</Grid>
</ExperimentalAcrylicBorder>
</Border>
<!-- Thumbnails -->
<ListBox

16
StabilityMatrix.Avalonia/Controls/PromptCard.axaml

@ -73,13 +73,13 @@
</StackPanel>
<ExperimentalAcrylicBorder
<Border
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
Classes="theme-dark"
VerticalAlignment="Stretch"
CornerRadius="4"
Material="{StaticResource OpaqueDarkAcrylicMaterial}">
CornerRadius="4">
<avaloniaEdit:TextEditor
x:Name="PromptEditor"
@ -94,7 +94,7 @@
</i:Interaction.Behaviors>
</avaloniaEdit:TextEditor>
</ExperimentalAcrylicBorder>
</Border>
</Grid>
<GridSplitter
@ -115,11 +115,11 @@
Value="fa-solid fa-caret-down" />
</StackPanel>
<ExperimentalAcrylicBorder
<Border
Grid.Row="1"
Classes="theme-dark"
VerticalAlignment="Stretch"
CornerRadius="4"
Material="{StaticResource OpaqueDarkAcrylicMaterial}">
CornerRadius="4">
<avaloniaEdit:TextEditor
x:Name="NegativePromptEditor"
@ -135,7 +135,7 @@
</avaloniaEdit:TextEditor>
</ExperimentalAcrylicBorder>
</Border>
</Grid>
</Grid>
</controls:Card>

18
StabilityMatrix.Avalonia/Styles/BorderStyles.axaml

@ -0,0 +1,18 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Design.PreviewWith>
<StackPanel Margin="16" Spacing="4" Height="400" Width="300">
<Border Padding="16">
<TextBlock Text="Default Test"/>
</Border>
<Border Padding="16" Classes="theme-dark">
<TextBlock Text="theme-dark Test"/>
</Border>
</StackPanel>
</Design.PreviewWith>
<!-- Add Styles Here -->
<Style Selector="Border.theme-dark">
<Setter Property="Background" Value="{DynamicResource ThemeDarkAccentBackgroundBrush}"/>
</Style>
</Styles>

6
StabilityMatrix.Avalonia/Styles/ThemeColors.axaml

@ -36,6 +36,8 @@
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Default">
<SolidColorBrush x:Key="ThemeBackgroundBrush" Color="#AAAAAA"/>
<SolidColorBrush x:Key="ThemeDarkAccentForegroundBrush" Color="#AAAAAA"/>
<SolidColorBrush x:Key="ThemeDarkAccentBackgroundBrush" Color="#686868"/>
<SolidColorBrush x:Key="RegionColor" Color="#AAAAAA"/>
<SolidColorBrush x:Key="CompletionBorderBrush" Color="#43454A"/>
@ -49,6 +51,8 @@
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="ThemeBackgroundBrush" Color="#282828"/>
<SolidColorBrush x:Key="ThemeDarkAccentForegroundBrush" Color="#AAAAAA"/>
<SolidColorBrush x:Key="ThemeDarkAccentBackgroundBrush" Color="#252525"/>
<SolidColorBrush x:Key="RegionColor" Color="#282828"/>
<SolidColorBrush x:Key="CompletionBorderBrush" Color="#43454A"/>
@ -62,6 +66,8 @@
<ResourceDictionary x:Key="{x:Static sty:FluentAvaloniaTheme.HighContrastTheme}">
<SolidColorBrush x:Key="ThemeBackgroundBrush" Color="#AAAAAA"/>
<SolidColorBrush x:Key="ThemeDarkAccentForegroundBrush" Color="#AAAAAA"/>
<SolidColorBrush x:Key="ThemeDarkAccentBackgroundBrush" Color="#686868"/>
<SolidColorBrush x:Key="RegionColor" Color="#AAAAAA"/>
<SolidColorBrush x:Key="CompletionBorderBrush" Color="#43454A"/>

Loading…
Cancel
Save