Skip to content

InfoBar: add text wrapping support #439

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

Merged
pomianowski merged 1 commit into from
Oct 15, 2022
Merged

InfoBar: add text wrapping support #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 72 additions & 15 deletions src/Wpf.Ui.Gallery/Views/Pages/StatusAndInfo/InfoBarPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,61 @@
<ui:UiPage x:Class="Wpf.Ui.Gallery.Views.Pages.StatusAndInfo.InfoBarPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.StatusAndInfo"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml" Title="InfoBarPage" d:DataContext="{d:DesignInstance local:InfoBarPage, IsDesignTimeCreatable=False}" d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d">
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Wpf.Ui.Gallery.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Wpf.Ui.Gallery.Views.Pages.StatusAndInfo"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:system="clr-namespace:System;assembly=System.Runtime"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Title="InfoBarPage"
d:DataContext="{d:DesignInstance local:InfoBarPage,
IsDesignTimeCreatable=False}"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<ui:UiPage.Resources>
<system:String x:Key="PageXamlUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Styles/Controls/InfoBar.xaml</system:String>
<system:String x:Key="PageCsharpUrl">https://github.com/lepoco/wpfui/blob/development/src/Wpf.Ui/Controls/InfoBar.cs</system:String>
</ui:UiPage.Resources>

<Grid>
<ui:DynamicScrollViewer x:Name="PageScrollViewer" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ui:DynamicScrollViewer x:Name="PageScrollViewer"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="280" />
</Grid.ColumnDefinitions>

<Grid Grid.Column="0" Margin="42">
<controls:GalleryControlPresenter Grid.Row="0" Margin="0" CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Essential message.&quot; /&gt;" HeaderText="A closable InfoBar.">
<StackPanel Grid.Column="0" Margin="42">
<controls:GalleryControlPresenter Margin="0,0,0,42"
CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Essential message.&quot; /&gt;"
HeaderText="A closable InfoBar.">
<controls:GalleryControlPresenter.Content>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ui:InfoBar Title="Title" Grid.Column="0" IsOpen="{Binding ViewModel.IsInfoBarOpened, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=OneWay}" Message="Essential app message." Severity="{Binding ViewModel.InfoBarSeverity, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=OneWay}" />
<ui:InfoBar Title="Title"
Grid.Column="0"
IsOpen="{Binding ViewModel.IsInfoBarOpened, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=OneWay}"
Message="Essential app message."
Severity="{Binding ViewModel.InfoBarSeverity, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=OneWay}" />
<Grid Grid.Column="1" Margin="12,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<CheckBox Grid.Row="0" MinWidth="0" Content="Is open" IsChecked="{Binding ViewModel.IsInfoBarOpened, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=TwoWay}" />
<ComboBox Grid.Row="1" MinWidth="140" Margin="0,8,0,0" SelectedIndex="{Binding ViewModel.InfoBarSeverityComboBoxSelectedIndex, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=TwoWay}">
<CheckBox Grid.Row="0"
MinWidth="0"
Content="Is open"
IsChecked="{Binding ViewModel.IsInfoBarOpened, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=TwoWay}" />
<ComboBox Grid.Row="1"
MinWidth="140"
Margin="0,8,0,0"
SelectedIndex="{Binding ViewModel.InfoBarSeverityComboBoxSelectedIndex, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=TwoWay}">
<ComboBoxItem Content="Informational" />
<ComboBoxItem Content="Success" />
<ComboBoxItem Content="Warning" />
Expand All @@ -45,7 +65,44 @@
</Grid>
</controls:GalleryControlPresenter.Content>
</controls:GalleryControlPresenter>
</Grid>

<controls:GalleryControlPresenter Margin="0"
CodeText="&lt;ui:InfoBar Title=&quot;Title&quot; Message=&quot;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.&quot; /&gt;"
HeaderText="A closable InfoBar with a long message.">
<controls:GalleryControlPresenter.Content>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ui:InfoBar Title="Title"
Grid.Column="0"
IsOpen="{Binding ViewModel.IsInfoBarOpened, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=OneWay}"
Message="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
Severity="{Binding ViewModel.InfoBarSeverity, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=OneWay}" />
<Grid Grid.Column="1" Margin="12,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<CheckBox Grid.Row="0"
MinWidth="0"
Content="Is open"
IsChecked="{Binding ViewModel.IsInfoBarOpened, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=TwoWay}" />
<ComboBox Grid.Row="1"
MinWidth="140"
Margin="0,8,0,0"
SelectedIndex="{Binding ViewModel.InfoBarSeverityComboBoxSelectedIndex, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:InfoBarPage}, Mode=TwoWay}">
<ComboBoxItem Content="Informational" />
<ComboBoxItem Content="Success" />
<ComboBoxItem Content="Warning" />
<ComboBoxItem Content="Error" />
</ComboBox>
</Grid>
</Grid>
</controls:GalleryControlPresenter.Content>
</controls:GalleryControlPresenter>
</StackPanel>
</Grid>
</ui:DynamicScrollViewer>
<controls:ControlDocumentationSummary CsharpUrl="{StaticResource PageCsharpUrl}" XamlUrl="{StaticResource PageXamlUrl}" />
Expand Down
82 changes: 41 additions & 41 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 @@ -5,13 +5,13 @@
All Rights Reserved.
-->

<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Wpf.Ui.Controls">
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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="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 @@ -42,53 +42,53 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type controls:InfoBar}">
<Grid x:Name="InfoBarRoot">
<Border
x:Name="ContentBorder"
Padding="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Border.CornerRadius}">
<Border x:Name="ContentBorder"
Padding="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding Border.CornerRadius}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<controls:SymbolIcon
x:Name="SymbolIcon"
Grid.Column="0"
Margin="0,0,10,0"
Filled="True" />
<Border Margin="0,0,10,0">
<controls:SymbolIcon x:Name="SymbolIcon"
Grid.Column="0"
Margin="{StaticResource InfoBarFirstRowMargin}"
VerticalAlignment="Top"
Filled="True" />
</Border>

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

<ContentPresenter
Grid.Column="2"
Margin="0"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Message}"
ScrollViewer.CanContentScroll="False"
TextElement.FontSize="{TemplateBinding FontSize}" />
<TextBlock Margin="0"
ScrollViewer.CanContentScroll="False"
Text="{TemplateBinding Message}"
TextElement.FontSize="{TemplateBinding FontSize}"
TextWrapping="Wrap" />
</WrapPanel>

<controls:Button
x:Name="CloseButton"
Grid.Column="3"
Background="Transparent"
BorderThickness="0"
Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
Icon="Dismiss24" />
<Border Grid.Column="2" Margin="10,0,0,0">
<controls:Button x:Name="CloseButton"
Margin="{StaticResource InfoBarFirstRowMargin}"
VerticalAlignment="Top"
Background="Transparent"
BorderThickness="0"
Command="{Binding Path=TemplateButtonCommand, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
Icon="Dismiss24" />
</Border>
</Grid>
</Border>
</Grid>
Expand Down