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

fix: close #1367

Browse Source
This commit is contained in:
NaBian committed 2023-03-18 15:07:10 +08:00
1 parent e932327ade
commit 4564e7efbf
2 files changed
+23 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+1 -1
View File
@@ -66,7 +66,7 @@
<hc:SimplePanel Background="#FFE8E03F"/>
</hc:TabItem>
</hc:TabControl>
<hc:TabControl Grid.Row="2" IsAnimationEnabled="True" Margin="0,32,0,0" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" MaxWidth="800" Height="300">
<hc:TabControl Grid.Row="2" IsAnimationEnabled="True" Margin="0,32,0,0" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" MaxWidth="800" Height="300" OverflowMenuDisplayMemberPath="Header">
<TabControl.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Header}"/>
src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
+22 -3
View File
@@ -219,6 +219,15 @@ public class TabControl : System.Windows.Controls.TabControl
set => SetValue(ShowScrollButtonProperty, ValueBoxes.BooleanBox(value));
}
public static readonly DependencyProperty OverflowMenuDisplayMemberPathProperty = DependencyProperty.Register(
nameof(OverflowMenuDisplayMemberPath), typeof(string), typeof(TabControl), new PropertyMetadata(default(string)));
public string OverflowMenuDisplayMemberPath
{
get => (string) GetValue(OverflowMenuDisplayMemberPathProperty);
set => SetValue(OverflowMenuDisplayMemberPathProperty, value);
}
/// <summary>
/// 可见的标签数量
/// </summary>
@@ -346,10 +355,20 @@ public class TabControl : System.Windows.Controls.TabControl
if (item.DataContext is not null)
{
menuItem.SetBinding(HeaderedItemsControl.HeaderProperty, new Binding(DisplayMemberPath)
if (ItemTemplate is null)
{
Source = item.DataContext
});
menuItem.SetBinding(HeaderedItemsControl.HeaderProperty, new Binding(DisplayMemberPath)
{
Source = item.DataContext
});
}
else
{
menuItem.SetBinding(HeaderedItemsControl.HeaderProperty, new Binding(OverflowMenuDisplayMemberPath)
{
Source = item.DataContext
});
}
}
else
{