Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved InfoBar styling #681

Merged
merged 2 commits into from
Jul 1, 2023
Merged

Improved InfoBar styling #681

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
441c85a
Update InfoBar.xaml
niels9001 Jun 28, 2023
81f408e
Merge branch 'development' into niels9001/infobar
pomianowski Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions src/Wpf.Ui/Styles/Controls/InfoBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Wpf.Ui.Controls">

<Thickness x:Key="InfoBarPadding">14,16,14,16</Thickness>
<Thickness x:Key="InfoBarPadding">14,8,14,8</Thickness>
<Thickness x:Key="InfoBarBorderThemeThickness">1</Thickness>
<Thickness x:Key="InfoBarFirstRowMargin">0,7,0,0</Thickness>

<Style TargetType="{x:Type controls:InfoBar}">
<Setter Property="Background">
Expand Down Expand Up @@ -45,7 +44,7 @@
<Grid x:Name="InfoBarRoot">
<Border
x:Name="ContentBorder"
Padding="{TemplateBinding Padding}"
Padding="16,14,16,10"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}"
Expand All @@ -58,23 +57,21 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<Border Margin="0,0,10,0">
<Border Margin="0,2,14,0" VerticalAlignment="Top">
<controls:SymbolIcon
x:Name="SymbolIcon"
Margin="{StaticResource InfoBarFirstRowMargin}"
VerticalAlignment="Top"
Filled="True"
FontSize="16" />
</Border>

<WrapPanel Grid.Column="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<WrapPanel Grid.Column="1" VerticalAlignment="Top">
<TextBlock
Margin="0,0,10,0"
Margin="0,0,14,0"
ScrollViewer.CanContentScroll="False"
Text="{TemplateBinding Title}"
TextElement.FontSize="{TemplateBinding FontSize}"
TextElement.FontWeight="Bold"
TextElement.FontWeight="SemiBold"
TextWrapping="Wrap" />

<TextBlock
Expand All @@ -87,13 +84,11 @@

<Border
Grid.Column="2"
Margin="10,0,0,0"
VerticalAlignment="Center">
Margin="12,-2,0,0"
VerticalAlignment="Top">
<controls:Button
x:Name="CloseButton"
Margin="{StaticResource InfoBarFirstRowMargin}"
Padding="6"
VerticalAlignment="Top"
Padding="4"
Background="Transparent"
BorderThickness="0"
Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
Expand All @@ -119,22 +114,26 @@
</Trigger>

<Trigger Property="Severity" Value="Informational">
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource PaletteBlueBrush}" />
<Setter TargetName="SymbolIcon" Property="Foreground">
<Setter.Value>
<SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
</Setter.Value>
</Setter>
<Setter TargetName="SymbolIcon" Property="Symbol" Value="Info24" />
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource SystemFillColorNeutralBackgroundBrush}" />
</Trigger>
<Trigger Property="Severity" Value="Success">
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource PaletteGreenBrush}" />
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource SystemFillColorSuccessBrush}" />
<Setter TargetName="SymbolIcon" Property="Symbol" Value="CheckmarkCircle24" />
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource SystemFillColorSuccessBackgroundBrush}" />
</Trigger>
<Trigger Property="Severity" Value="Warning">
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource PaletteBrownBrush}" />
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource SystemFillColorCautionBrush}" />
<Setter TargetName="SymbolIcon" Property="Symbol" Value="ErrorCircle24" />
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource SystemFillColorCautionBackgroundBrush}" />
</Trigger>
<Trigger Property="Severity" Value="Error">
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource PaletteRedBrush}" />
<Setter TargetName="SymbolIcon" Property="Foreground" Value="{DynamicResource SystemFillColorCriticalBrush}" />
<Setter TargetName="SymbolIcon" Property="Symbol" Value="DismissCircle24" />
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource SystemFillColorCriticalBackgroundBrush}" />
</Trigger>
Expand Down