Merge branch 'master' into add-RelativePanel
This commit is contained in:
commit
af877ffc91
12 files changed
+68
-43
No files matched your search
@@ -5,12 +5,12 @@
|
|||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
<AssemblyName>HandyControlDemo</AssemblyName>
|
<AssemblyName>HandyControlDemo</AssemblyName>
|
||||||
<RootNamespace>HandyControlDemo</RootNamespace>
|
<RootNamespace>HandyControlDemo</RootNamespace>
|
||||||
<Version>2.3.0</Version>
|
<Version>2.4.0</Version>
|
||||||
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
|
<ApplicationIcon>..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico</ApplicationIcon>
|
||||||
<Configurations>Debug;Release</Configurations>
|
<Configurations>Debug;Release</Configurations>
|
||||||
<Copyright>Copyright © HandyOrg 2018-2019</Copyright>
|
<Copyright>Copyright © HandyOrg 2018-2019</Copyright>
|
||||||
<FileVersion>2.3.0.0</FileVersion>
|
<FileVersion>2.4.0.0</FileVersion>
|
||||||
<AssemblyVersion>2.3.0.0</AssemblyVersion>
|
<AssemblyVersion>2.4.0.0</AssemblyVersion>
|
||||||
<LangVersion>8.0</LangVersion>
|
<LangVersion>8.0</LangVersion>
|
||||||
<Authors>HandyOrg</Authors>
|
<Authors>HandyOrg</Authors>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
<AssemblyName>HandyControl</AssemblyName>
|
<AssemblyName>HandyControl</AssemblyName>
|
||||||
<RootNamespace>HandyControl</RootNamespace>
|
<RootNamespace>HandyControl</RootNamespace>
|
||||||
<Version>2.3.0</Version>
|
<Version>2.4.0</Version>
|
||||||
<AssemblyVersion>2.3.0.0</AssemblyVersion>
|
<AssemblyVersion>2.4.0.0</AssemblyVersion>
|
||||||
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
|
||||||
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
|
||||||
<Copyright>Copyright © HandyOrg 2018-2019</Copyright>
|
<Copyright>Copyright © HandyOrg 2018-2019</Copyright>
|
||||||
|
|||||||
@@ -13,5 +13,5 @@ using System.Windows;
|
|||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
||||||
[assembly: AssemblyVersion("2.3.0")]
|
[assembly: AssemblyVersion("2.4.0")]
|
||||||
#endif
|
#endif
|
||||||
@@ -434,6 +434,7 @@ namespace HandyControl.Controls
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private void Init()
|
private void Init()
|
||||||
{
|
{
|
||||||
|
if (_panelColor == null) return;
|
||||||
UpdateStatus(SelectedBrush.Color);
|
UpdateStatus(SelectedBrush.Color);
|
||||||
_panelColor.Children.Clear();
|
_panelColor.Children.Clear();
|
||||||
foreach (var item in _colorPresetList)
|
foreach (var item in _colorPresetList)
|
||||||
|
|||||||
@@ -800,7 +800,7 @@ namespace HandyControl.Controls
|
|||||||
_timerClose?.Stop();
|
_timerClose?.Stop();
|
||||||
var transform = new TranslateTransform();
|
var transform = new TranslateTransform();
|
||||||
_gridMain.RenderTransform = transform;
|
_gridMain.RenderTransform = transform;
|
||||||
var animation = AnimationHelper.CreateAnimation(MaxWidth);
|
var animation = AnimationHelper.CreateAnimation(ActualWidth);
|
||||||
animation.Completed += (s, e) =>
|
animation.Completed += (s, e) =>
|
||||||
{
|
{
|
||||||
if (Parent is Panel panel)
|
if (Parent is Panel panel)
|
||||||
|
|||||||
@@ -3,27 +3,30 @@ using System.Windows.Controls;
|
|||||||
|
|
||||||
namespace HandyControl.Controls
|
namespace HandyControl.Controls
|
||||||
{
|
{
|
||||||
[TemplatePart(Name = ElementGrowPanel, Type = typeof(Panel))]
|
public sealed class GrowlWindow : Window
|
||||||
internal class GrowlWindow : Window
|
|
||||||
{
|
{
|
||||||
private const string ElementGrowPanel = "PART_GrowPanel";
|
internal Panel GrowlPanel { get; set; }
|
||||||
|
|
||||||
public Panel GrowlPanel { get; set; }
|
internal GrowlWindow()
|
||||||
|
|
||||||
public GrowlWindow()
|
|
||||||
{
|
{
|
||||||
WindowStyle = WindowStyle.None;
|
WindowStyle = WindowStyle.None;
|
||||||
AllowsTransparency = true;
|
AllowsTransparency = true;
|
||||||
|
|
||||||
|
GrowlPanel = new StackPanel
|
||||||
|
{
|
||||||
|
VerticalAlignment = VerticalAlignment.Top,
|
||||||
|
Margin = new Thickness(0, 10, 10, 10)
|
||||||
|
};
|
||||||
|
|
||||||
|
Content = new ScrollViewer
|
||||||
|
{
|
||||||
|
VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
|
||||||
|
IsEnableInertia = true,
|
||||||
|
Content = GrowlPanel
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnApplyTemplate()
|
internal void Init()
|
||||||
{
|
|
||||||
base.OnApplyTemplate();
|
|
||||||
|
|
||||||
GrowlPanel = GetTemplateChild(ElementGrowPanel) as Panel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Init()
|
|
||||||
{
|
{
|
||||||
var desktopWorkingArea = SystemParameters.WorkArea;
|
var desktopWorkingArea = SystemParameters.WorkArea;
|
||||||
Height = desktopWorkingArea.Height;
|
Height = desktopWorkingArea.Height;
|
||||||
|
|||||||
@@ -78,5 +78,14 @@ namespace HandyControl.Controls
|
|||||||
get => (Thickness)GetValue(BadgeMarginProperty);
|
get => (Thickness)GetValue(BadgeMarginProperty);
|
||||||
set => SetValue(BadgeMarginProperty, value);
|
set => SetValue(BadgeMarginProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ShowBadgeProperty = DependencyProperty.Register(
|
||||||
|
"ShowBadge", typeof(bool), typeof(Badge), new PropertyMetadata(ValueBoxes.TrueBox));
|
||||||
|
|
||||||
|
public bool ShowBadge
|
||||||
|
{
|
||||||
|
get => (bool) GetValue(ShowBadgeProperty);
|
||||||
|
set => SetValue(ShowBadgeProperty, value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,6 +40,8 @@ namespace HandyControl.Controls
|
|||||||
{
|
{
|
||||||
if (item.Role == SideMenuItemRole.Item)
|
if (item.Role == SideMenuItemRole.Item)
|
||||||
{
|
{
|
||||||
|
_isItemSelected = true;
|
||||||
|
|
||||||
if (Equals(item, _selectedItem)) return;
|
if (Equals(item, _selectedItem)) return;
|
||||||
|
|
||||||
if (_selectedItem != null)
|
if (_selectedItem != null)
|
||||||
@@ -53,7 +55,6 @@ namespace HandyControl.Controls
|
|||||||
{
|
{
|
||||||
Info = e.OriginalSource
|
Info = e.OriginalSource
|
||||||
});
|
});
|
||||||
_isItemSelected = true;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -92,7 +93,10 @@ namespace HandyControl.Controls
|
|||||||
}
|
}
|
||||||
else if(_selectedHeader != null)
|
else if(_selectedHeader != null)
|
||||||
{
|
{
|
||||||
_selectedHeader.SelectDefaultItem();
|
if (AutoSelect)
|
||||||
|
{
|
||||||
|
_selectedHeader.SelectDefaultItem();
|
||||||
|
}
|
||||||
_isItemSelected = false;
|
_isItemSelected = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -117,6 +121,15 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
|
protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
|
||||||
|
|
||||||
|
public static readonly DependencyProperty AutoSelectProperty = DependencyProperty.Register(
|
||||||
|
"AutoSelect", typeof(bool), typeof(SideMenu), new PropertyMetadata(ValueBoxes.TrueBox));
|
||||||
|
|
||||||
|
public bool AutoSelect
|
||||||
|
{
|
||||||
|
get => (bool) GetValue(AutoSelectProperty);
|
||||||
|
set => SetValue(AutoSelectProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty ExpandModeProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty ExpandModeProperty = DependencyProperty.Register(
|
||||||
"ExpandMode", typeof(ExpandMode), typeof(SideMenu), new PropertyMetadata(default(ExpandMode), OnExpandModeChanged));
|
"ExpandMode", typeof(ExpandMode), typeof(SideMenu), new PropertyMetadata(default(ExpandMode), OnExpandModeChanged));
|
||||||
|
|
||||||
|
|||||||
@@ -102,7 +102,15 @@ namespace HandyControl.Controls
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
internal TabPanel TabPanel
|
internal TabPanel TabPanel
|
||||||
{
|
{
|
||||||
get => _tabPanel ??= TabControlParent.HeaderPanel;
|
get
|
||||||
|
{
|
||||||
|
if (_tabPanel == null && TabControlParent != null)
|
||||||
|
{
|
||||||
|
_tabPanel = TabControlParent.HeaderPanel;
|
||||||
|
}
|
||||||
|
|
||||||
|
return _tabPanel;
|
||||||
|
}
|
||||||
set => _tabPanel = value;
|
set => _tabPanel = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
|
|||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: AssemblyVersion("2.3.0")]
|
[assembly: AssemblyVersion("2.4.0")]
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Controls")]
|
[assembly: XmlnsDefinition("https://handyorg.github.io/handycontrol", "HandyControl.Controls")]
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<ControlTemplate x:Key="BadgeTextTemplate" TargetType="controls:Badge">
|
<ControlTemplate x:Key="BadgeTextTemplate" TargetType="controls:Badge">
|
||||||
<controls:SimplePanel>
|
<controls:SimplePanel>
|
||||||
<ContentPresenter />
|
<ContentPresenter />
|
||||||
<Border x:Name="Border" RenderTransformOrigin="0.5 0.5" Style="{StaticResource BorderCircular}" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
|
<Border x:Name="Border" Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" RenderTransformOrigin="0.5 0.5" Style="{StaticResource BorderCircular}" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
|
||||||
<Border.RenderTransform>
|
<Border.RenderTransform>
|
||||||
<ScaleTransform />
|
<ScaleTransform />
|
||||||
</Border.RenderTransform>
|
</Border.RenderTransform>
|
||||||
@@ -33,14 +33,14 @@
|
|||||||
<ControlTemplate x:Key="BadgeDotTemplate" TargetType="controls:Badge">
|
<ControlTemplate x:Key="BadgeDotTemplate" TargetType="controls:Badge">
|
||||||
<controls:SimplePanel>
|
<controls:SimplePanel>
|
||||||
<ContentPresenter />
|
<ContentPresenter />
|
||||||
<Border Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
|
<Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
|
||||||
</controls:SimplePanel>
|
</controls:SimplePanel>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
|
|
||||||
<ControlTemplate x:Key="BadgeProcessingTemplate" TargetType="controls:Badge">
|
<ControlTemplate x:Key="BadgeProcessingTemplate" TargetType="controls:Badge">
|
||||||
<controls:SimplePanel>
|
<controls:SimplePanel>
|
||||||
<ContentPresenter />
|
<ContentPresenter />
|
||||||
<Ellipse Height="10" Width="10" Fill="{TemplateBinding Background}" RenderTransformOrigin="0.5 0.5" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
|
<Ellipse Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Height="10" Width="10" Fill="{TemplateBinding Background}" RenderTransformOrigin="0.5 0.5" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
|
||||||
<Ellipse.OpacityMask>
|
<Ellipse.OpacityMask>
|
||||||
<RadialGradientBrush>
|
<RadialGradientBrush>
|
||||||
<GradientStop Offset="0" Color="Transparent" />
|
<GradientStop Offset="0" Color="Transparent" />
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
</EventTrigger>
|
</EventTrigger>
|
||||||
</Ellipse.Triggers>
|
</Ellipse.Triggers>
|
||||||
</Ellipse>
|
</Ellipse>
|
||||||
<Border Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
|
<Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
|
||||||
</controls:SimplePanel>
|
</controls:SimplePanel>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
|
|
||||||
|
|||||||
@@ -19,15 +19,6 @@
|
|||||||
<Setter Property="ShowActivated" Value="False"/>
|
<Setter Property="ShowActivated" Value="False"/>
|
||||||
<Setter Property="ShowInTaskbar" Value="False"/>
|
<Setter Property="ShowInTaskbar" Value="False"/>
|
||||||
<Setter Property="Topmost" Value="True"/>
|
<Setter Property="Topmost" Value="True"/>
|
||||||
<Setter Property="Template">
|
|
||||||
<Setter.Value>
|
|
||||||
<ControlTemplate TargetType="controls:GrowlWindow">
|
|
||||||
<controls:ScrollViewer VerticalScrollBarVisibility="Hidden" IsEnableInertia="True">
|
|
||||||
<StackPanel Name="PART_GrowPanel" VerticalAlignment="Top" Margin="0,10,10,10"/>
|
|
||||||
</controls:ScrollViewer>
|
|
||||||
</ControlTemplate>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style TargetType="controls:Growl">
|
<Style TargetType="controls:Growl">
|
||||||
@@ -56,7 +47,7 @@
|
|||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Width="320"/>
|
<Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(controls:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
|
||||||
<Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
|
<Path Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}"/>
|
||||||
<StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
|
<StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
|
||||||
<TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
|
<TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap"/>
|
||||||
@@ -65,14 +56,14 @@
|
|||||||
<Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
|
<Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
|
||||||
<Path Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}"/>
|
<Path Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<StackPanel Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Orientation="Horizontal" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
|
<UniformGrid Columns="2" Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
|
||||||
<Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" Width="160">
|
<Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
|
||||||
<TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}"/>
|
<TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" Width="160">
|
<Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
|
||||||
<TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}"/>
|
<TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}"/>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</UniformGrid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
|
|||||||
Reference in new issue
Block a user