From 3bcc29ba43e9561a308a8f0f8322d0d3eaa50a56 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 21 Jun 2021 22:21:38 +0800
Subject: [PATCH] move GridExtension.cs to Controls/Attach/GridAttach.cs
---
.../Attach/GridAttach.cs} | 42 +++++++------------
.../HandyControl_Shared.projitems | 2 +-
2 files changed, 16 insertions(+), 28 deletions(-)
rename src/Shared/HandyControl_Shared/{Tools/Extension/GridExtension.cs => Controls/Attach/GridAttach.cs} (71%)
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/GridExtension.cs b/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
similarity index 71%
rename from src/Shared/HandyControl_Shared/Tools/Extension/GridExtension.cs
rename to src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
index ef01bc46..59604eac 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/GridExtension.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
@@ -2,28 +2,23 @@
using System.Windows;
using System.Windows.Controls;
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Controls
{
- public class GridExtensions
+ public class GridAttach
{
public static readonly DependencyProperty NameProperty = DependencyProperty.RegisterAttached(
- "Name", typeof(string), typeof(GridExtensions), new PropertyMetadata(default(string)));
+ "Name", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string)));
public static void SetName(DependencyObject element, string value)
- {
- element.SetValue(NameProperty, value);
- }
+ => element.SetValue(NameProperty, value);
public static string GetName(DependencyObject element)
- {
- return (string) element.GetValue(NameProperty);
- }
+ => (string)element.GetValue(NameProperty);
public static readonly DependencyProperty RowNameProperty = DependencyProperty.RegisterAttached(
- "RowName", typeof(string), typeof(GridExtensions),
- new PropertyMetadata(default(string), RowName_PropertyChanged));
+ "RowName", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string), OnRowNameChanged));
- private static void RowName_PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ private static void OnRowNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is FrameworkElement frameworkElement)
{
@@ -40,6 +35,7 @@ namespace HandyControl.Tools.Extension
{
var gridRowDefinition = grid.RowDefinitions[i];
var gridRowName = GetName(gridRowDefinition);
+
if (!string.IsNullOrEmpty(gridRowName) &&
gridRowName.Equals(rowName, StringComparison.Ordinal))
{
@@ -53,20 +49,15 @@ namespace HandyControl.Tools.Extension
}
public static void SetRowName(DependencyObject element, string value)
- {
- element.SetValue(RowNameProperty, value);
- }
+ => element.SetValue(RowNameProperty, value);
public static string GetRowName(DependencyObject element)
- {
- return (string) element.GetValue(RowNameProperty);
- }
+ => (string)element.GetValue(RowNameProperty);
public static readonly DependencyProperty ColumnNameProperty = DependencyProperty.RegisterAttached(
- "ColumnName", typeof(string), typeof(GridExtensions),
- new PropertyMetadata(default(string), ColumnName_PropertyChanged));
+ "ColumnName", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string), OnColumnNameChanged));
- private static void ColumnName_PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ private static void OnColumnNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
if (d is FrameworkElement frameworkElement)
{
@@ -83,6 +74,7 @@ namespace HandyControl.Tools.Extension
{
var gridColumnDefinition = grid.ColumnDefinitions[i];
var gridColumnName = GetName(gridColumnDefinition);
+
if (!string.IsNullOrEmpty(gridColumnName) &&
gridColumnName.Equals(columnName, StringComparison.Ordinal))
{
@@ -96,13 +88,9 @@ namespace HandyControl.Tools.Extension
}
public static void SetColumnName(DependencyObject element, string value)
- {
- element.SetValue(ColumnNameProperty, value);
- }
+ => element.SetValue(ColumnNameProperty, value);
public static string GetColumnName(DependencyObject element)
- {
- return (string) element.GetValue(ColumnNameProperty);
- }
+ => (string)element.GetValue(ColumnNameProperty);
}
}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 313581e1..4445241a 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -15,6 +15,7 @@
+
@@ -143,7 +144,6 @@
-