chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance: add IsMouseSelectable property for StepBar (#1142)

Browse Source 
close #1142
This commit is contained in:
NaBian committed 2022-03-28 00:18:49 +08:00
1 parent 3e7bd22f32
commit 759abff637
6 files changed
+69 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+14 -12
View File
@@ -10663,12 +10663,14 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="hc:StepBarItem"> <ControlTemplate TargetType="hc:StepBarItem">
<StackPanel> <Border Background="Transparent">
<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24"> <StackPanel>
<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" /> <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
</Border> <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" /> </Border>
</StackPanel> <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" />
</StackPanel>
</Border>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@@ -10688,7 +10690,7 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem"> <Style x:Key="StepBarItemVertical" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
<Setter Property="Margin" Value="0, 10" /> <Setter Property="Margin" Value="0, 10" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@@ -10715,7 +10717,7 @@
<ItemsPresenter VerticalAlignment="Bottom" /> <ItemsPresenter VerticalAlignment="Bottom" />
</hc:SimplePanel> </hc:SimplePanel>
</ControlTemplate> </ControlTemplate>
<ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar"> <ControlTemplate x:Key="StepBarVerticalControlTemplate" TargetType="hc:StepBar">
<hc:SimplePanel> <hc:SimplePanel>
<ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5"> <ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
<ProgressBar.RenderTransform> <ProgressBar.RenderTransform>
@@ -10734,8 +10736,8 @@
<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" /> <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
<Style.Triggers> <Style.Triggers>
<Trigger Property="Dock" Value="Left"> <Trigger Property="Dock" Value="Left">
<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" /> <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVertical}" />
<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" /> <Setter Property="Template" Value="{StaticResource StepBarVerticalControlTemplate}" />
<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" /> <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
</Trigger> </Trigger>
<Trigger Property="Dock" Value="Bottom"> <Trigger Property="Dock" Value="Bottom">
@@ -10745,8 +10747,8 @@
</Trigger> </Trigger>
<Trigger Property="Dock" Value="Right"> <Trigger Property="Dock" Value="Right">
<Setter Property="FlowDirection" Value="RightToLeft" /> <Setter Property="FlowDirection" Value="RightToLeft" />
<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" /> <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVertical}" />
<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" /> <Setter Property="Template" Value="{StaticResource StepBarVerticalControlTemplate}" />
<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" /> <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml
+2 -2
View File
@@ -29,7 +29,7 @@
<Button Command="{Binding PrevCmd}" CommandParameter="{Binding ElementName=PanelMain}" Width="180" Content="{ex:Lang Key={x:Static langs:LangKeys.Prev}}" Style="{StaticResource ButtonPrimary}"/> <Button Command="{Binding PrevCmd}" CommandParameter="{Binding ElementName=PanelMain}" Width="180" Content="{ex:Lang Key={x:Static langs:LangKeys.Prev}}" Style="{StaticResource ButtonPrimary}"/>
<Button Command="{Binding NextCmd}" CommandParameter="{Binding ElementName=PanelMain}" Width="180" Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.Next}}" Style="{StaticResource ButtonPrimary}"/> <Button Command="{Binding NextCmd}" CommandParameter="{Binding ElementName=PanelMain}" Width="180" Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.Next}}" Style="{StaticResource ButtonPrimary}"/>
</StackPanel> </StackPanel>
<hc:StepBar Margin="0,0,0,32" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Dock="Bottom"> <hc:StepBar IsMouseSelectable="True" Margin="0,0,0,32" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Dock="Bottom">
<hc:StepBarItem Content="{ex:Lang Key={x:Static langs:LangKeys.Register}}"/> <hc:StepBarItem Content="{ex:Lang Key={x:Static langs:LangKeys.Register}}"/>
<hc:StepBarItem Content="{ex:Lang Key={x:Static langs:LangKeys.BasicInfo}}"/> <hc:StepBarItem Content="{ex:Lang Key={x:Static langs:LangKeys.BasicInfo}}"/>
<hc:StepBarItem Content="{ex:Lang Key={x:Static langs:LangKeys.UploadFile}}"/> <hc:StepBarItem Content="{ex:Lang Key={x:Static langs:LangKeys.UploadFile}}"/>
@@ -48,7 +48,7 @@
</DataTemplate> </DataTemplate>
</hc:StepBar.ItemTemplate> </hc:StepBar.ItemTemplate>
</hc:StepBar> </hc:StepBar>
<hc:StepBar Grid.Column="1" Grid.Row="3" ItemsSource="{Binding DataList}" Dock="Right"> <hc:StepBar IsMouseSelectable="True" Grid.Column="1" Grid.Row="3" ItemsSource="{Binding DataList}" Dock="Right">
<hc:StepBar.ItemTemplate> <hc:StepBar.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel> <StackPanel>
src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
+24
View File
@@ -30,7 +30,22 @@ public class StepBar : ItemsControl
{ {
CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) => Next())); CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) => Next()));
CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) => Prev())); CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) => Prev()));
ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged; ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
AddHandler(SelectableItem.SelectedEvent, new RoutedEventHandler(OnStepBarItemSelected));
}
private void OnStepBarItemSelected(object sender, RoutedEventArgs e)
{
if (!IsMouseSelectable)
{
return;
}
if (e.OriginalSource is StepBarItem item)
{
SetCurrentValue(StepIndexProperty, item.Index - 1);
}
} }
private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e) private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e)
@@ -151,6 +166,15 @@ public class StepBar : ItemsControl
set => SetValue(DockProperty, value); set => SetValue(DockProperty, value);
} }
public static readonly DependencyProperty IsMouseSelectableProperty = DependencyProperty.Register(
"IsMouseSelectable", typeof(bool), typeof(StepBar), new PropertyMetadata(ValueBoxes.FalseBox));
public bool IsMouseSelectable
{
get => (bool) GetValue(IsMouseSelectableProperty);
set => SetValue(IsMouseSelectableProperty, ValueBoxes.BooleanBox(value));
}
public override void OnApplyTemplate() public override void OnApplyTemplate()
{ {
base.OnApplyTemplate(); base.OnApplyTemplate();
src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using System.Windows; using System.Windows;
using System.Windows.Controls;
using HandyControl.Data; using HandyControl.Data;
namespace HandyControl.Controls; namespace HandyControl.Controls;
@@ -7,7 +6,7 @@ namespace HandyControl.Controls;
/// <summary> /// <summary>
/// 步骤条单元项 /// 步骤条单元项
/// </summary> /// </summary>
public class StepBarItem : ContentControl public class StepBarItem : SelectableItem
{ {
/// <summary> /// <summary>
/// 步骤编号 /// 步骤编号
src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
+14 -12
View File
@@ -23,12 +23,14 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="hc:StepBarItem"> <ControlTemplate TargetType="hc:StepBarItem">
<StackPanel> <Border Background="Transparent">
<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24"> <StackPanel>
<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}"/> <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
</Border> <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}"/>
<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0"/> </Border>
</StackPanel> <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0"/>
</StackPanel>
</Border>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@@ -50,7 +52,7 @@
</Setter> </Setter>
</Style> </Style>
<Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem"> <Style x:Key="StepBarItemVertical" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
<Setter Property="Margin" Value="0, 10"/> <Setter Property="Margin" Value="0, 10"/>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@@ -80,7 +82,7 @@
</hc:SimplePanel> </hc:SimplePanel>
</ControlTemplate> </ControlTemplate>
<ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar"> <ControlTemplate x:Key="StepBarVerticalControlTemplate" TargetType="hc:StepBar">
<hc:SimplePanel> <hc:SimplePanel>
<ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5"> <ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
<ProgressBar.RenderTransform> <ProgressBar.RenderTransform>
@@ -100,8 +102,8 @@
<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}"/> <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}"/>
<Style.Triggers> <Style.Triggers>
<Trigger Property="Dock" Value="Left"> <Trigger Property="Dock" Value="Left">
<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}"/> <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVertical}"/>
<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}"/> <Setter Property="Template" Value="{StaticResource StepBarVerticalControlTemplate}"/>
<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/> <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/>
</Trigger> </Trigger>
<Trigger Property="Dock" Value="Bottom"> <Trigger Property="Dock" Value="Bottom">
@@ -111,8 +113,8 @@
</Trigger> </Trigger>
<Trigger Property="Dock" Value="Right"> <Trigger Property="Dock" Value="Right">
<Setter Property="FlowDirection" Value="RightToLeft"/> <Setter Property="FlowDirection" Value="RightToLeft"/>
<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}"/> <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVertical}"/>
<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}"/> <Setter Property="Template" Value="{StaticResource StepBarVerticalControlTemplate}"/>
<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/> <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/>
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
src/Shared/HandyControl_Shared/Themes/Theme.xaml
+14 -12
View File
@@ -10781,12 +10781,14 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="hc:StepBarItem"> <ControlTemplate TargetType="hc:StepBarItem">
<StackPanel> <Border Background="Transparent">
<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24"> <StackPanel>
<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" /> <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
</Border> <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" /> </Border>
</StackPanel> <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" />
</StackPanel>
</Border>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@@ -10806,7 +10808,7 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem"> <Style x:Key="StepBarItemVertical" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
<Setter Property="Margin" Value="0, 10" /> <Setter Property="Margin" Value="0, 10" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@@ -10833,7 +10835,7 @@
<ItemsPresenter VerticalAlignment="Bottom" /> <ItemsPresenter VerticalAlignment="Bottom" />
</hc:SimplePanel> </hc:SimplePanel>
</ControlTemplate> </ControlTemplate>
<ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar"> <ControlTemplate x:Key="StepBarVerticalControlTemplate" TargetType="hc:StepBar">
<hc:SimplePanel> <hc:SimplePanel>
<ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5"> <ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
<ProgressBar.RenderTransform> <ProgressBar.RenderTransform>
@@ -10852,8 +10854,8 @@
<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" /> <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
<Style.Triggers> <Style.Triggers>
<Trigger Property="Dock" Value="Left"> <Trigger Property="Dock" Value="Left">
<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" /> <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVertical}" />
<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" /> <Setter Property="Template" Value="{StaticResource StepBarVerticalControlTemplate}" />
<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" /> <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
</Trigger> </Trigger>
<Trigger Property="Dock" Value="Bottom"> <Trigger Property="Dock" Value="Bottom">
@@ -10863,8 +10865,8 @@
</Trigger> </Trigger>
<Trigger Property="Dock" Value="Right"> <Trigger Property="Dock" Value="Right">
<Setter Property="FlowDirection" Value="RightToLeft" /> <Setter Property="FlowDirection" Value="RightToLeft" />
<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" /> <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVertical}" />
<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" /> <Setter Property="Template" Value="{StaticResource StepBarVerticalControlTemplate}" />
<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" /> <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>