Fix issues and rename.
This commit is contained in:
1 parent
19c16608d9
commit
08967132c4
2 files changed
+12
-20
No files matched your search
@@ -9,7 +9,7 @@
|
|||||||
<hc:TransitioningContentControl>
|
<hc:TransitioningContentControl>
|
||||||
<TabControl Style="{StaticResource TabControlInLine}">
|
<TabControl Style="{StaticResource TabControlInLine}">
|
||||||
<TabItem Header="{ex:Lang Key={x:Static langs:LangKeys.Common}}">
|
<TabItem Header="{ex:Lang Key={x:Static langs:LangKeys.Common}}">
|
||||||
<DataGrid HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
|
<DataGrid hc:DataGridAttach.CanUnselectRowsWithBlankArea="True" HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
|
||||||
<DataGrid.RowHeaderTemplate>
|
<DataGrid.RowHeaderTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
|
<CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
|
||||||
|
|||||||
@@ -312,20 +312,21 @@ namespace HandyControl.Controls
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 在 <see cref="DataGrid"/> 中点击空白地方取消选择所有 Row 和 Cell
|
/// 在 <see cref="DataGrid"/> 中点击空白地方取消选择所有 Row 和 Cell
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly DependencyProperty ClickBlankUnselectProperty =
|
public static readonly DependencyProperty CanUnselectRowsWithBlankAreaProperty =
|
||||||
DependencyProperty.RegisterAttached("ClickBlankUnselect", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(false, ClickBlankUnselectPropertyChanged));
|
DependencyProperty.RegisterAttached("CanUnselectRowsWithBlankArea", typeof(bool), typeof(DataGridAttach),
|
||||||
|
new PropertyMetadata(false, OnCanUnselectRowsWithBlankAreaChanged));
|
||||||
|
|
||||||
public static bool GetClickBlankUnselect(DependencyObject obj)
|
public static bool GetCanUnselectRowsWithBlankArea(DependencyObject obj)
|
||||||
{
|
{
|
||||||
return (bool)obj.GetValue(ClickBlankUnselectProperty);
|
return (bool)obj.GetValue(CanUnselectRowsWithBlankAreaProperty);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void SetClickBlankUnselect(DependencyObject obj, bool value)
|
public static void SetCanUnselectRowsWithBlankArea(DependencyObject obj, bool value)
|
||||||
{
|
{
|
||||||
obj.SetValue(ClickBlankUnselectProperty, value);
|
obj.SetValue(CanUnselectRowsWithBlankAreaProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void ClickBlankUnselectPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
public static void OnCanUnselectRowsWithBlankAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
{
|
{
|
||||||
if (d is DataGrid dataGrid && e.NewValue is bool enabled)
|
if (d is DataGrid dataGrid && e.NewValue is bool enabled)
|
||||||
{
|
{
|
||||||
@@ -338,19 +339,10 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
private static void DataGrid_PreviewMouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
|
private static void DataGrid_PreviewMouseDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is DataGrid dataGrid)
|
if (sender is DataGrid dataGrid && e.OriginalSource is System.Windows.Controls.ScrollViewer)
|
||||||
{
|
{
|
||||||
var dependencyObject = e.OriginalSource as DependencyObject;
|
dataGrid.CommitEdit();
|
||||||
while (dependencyObject != null && !(dependencyObject is DataGridRow))
|
dataGrid.UnselectAll();
|
||||||
{
|
|
||||||
dependencyObject = VisualTreeHelper.GetParent(dependencyObject);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dependencyObject == null)
|
|
||||||
{
|
|
||||||
dataGrid.CommitEdit();
|
|
||||||
dataGrid.UnselectAll();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user