fixed listviewgridviewstyle

CookCSharp · Mar 10, 2023 · c0b454d · c0b454d
1 parent d2e020e
commit c0b454d
Show file tree

Hide file tree

Showing 8 changed files with 184 additions and 121 deletions.
diff --git a/CookPopularCSharpToolkit/Windows/Helpers/ResourceHelper.cs b/CookPopularCSharpToolkit/Windows/Helpers/ResourceHelper.cs
@@ -25,5 +25,19 @@ public static TResource GetResource<TResource>(string resourceKey)
 
             return default(TResource);
         }
+
+        /// <summary>
+        /// 根据Key获取资源
+        /// </summary>
+        /// <typeparam name="TResource"></typeparam>
+        /// <param name="resourceKey"></param>
+        /// <returns></returns>
+        public static TResource GetResource<TResource>(object resourceKey)
+        {
+            if (Application.Current.TryFindResource(resourceKey) is TResource resource)
+                return resource;
+
+            return default(TResource);
+        }
     }
 }
diff --git a/CookPopularControl/Communal/Attached/DataGridViewAttached.cs b/CookPopularControl/Communal/Attached/DataGridViewAttached.cs
diff --git a/CookPopularControl/Controls/DialogBox/DialogExtensions.cs b/CookPopularControl/Controls/DialogBox/DialogExtensions.cs
@@ -93,15 +93,7 @@ void SetResult()
             {
                 try
                 {
-                    bool isExcute = false;
-                    if (dialog is Windows.DialogWindow win && win.IsConfirm)
-                        isExcute = true;
-                    else if (dialog is DialogBox dialogBox)
-                        isExcute = true;
-                    else
-                        isExcute = false;
-
-                    if (isExcute)
+                    if ((dialog is Windows.DialogWindow win && win.IsConfirm) || dialog is DialogBox)
                         tcs.TrySetResult(dialog.GetViewModel<IDialogResultable<TResult>>().Result);
                 }
                 catch (Exception e)

diff --git a/CookPopularControl/Controls/ItemsControl/ListViewAssistant.cs b/CookPopularControl/Controls/ItemsControl/ListViewAssistant.cs
@@ -1,5 +1,10 @@
-using System.Windows;
+using CookPopularCSharpToolkit.Communal;
+using CookPopularCSharpToolkit.Windows;
+using System;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
+using System.Xml.Linq;
 
 
 
@@ -12,12 +17,87 @@
 namespace CookPopularControl.Controls
 {
     /// <summary>
-    /// <see cref="ListView"/>的附加属性基类
+    /// 表示<see cref="GridViewColumn"/>的附加属性基类
+    /// </summary>
+    public class GridViewColumnAssistant
+    {
+        public static GridLength GetColumnMinWidth(DependencyObject obj) => (GridLength)obj.GetValue(ColumnMinWidthProperty);
+        public static void SetColumnMinWidth(DependencyObject obj, GridLength value) => obj.SetValue(ColumnMinWidthProperty, value);
+        /// <summary>
+        /// 标识<see cref="GridViewColumnHeader"/>列项最小宽度
+        /// </summary>
+        public static readonly DependencyProperty ColumnMinWidthProperty =
+            DependencyProperty.RegisterAttached("ColumnMinWidth", typeof(GridLength), typeof(GridViewColumnAssistant), new PropertyMetadata(GridLength.Auto, OnColumnMinWidthChanged));
+
+        private static void OnColumnMinWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is GridViewColumn column)
+            {
+                var defaultGridViewColumnHeaderStyle = ResourceHelper.GetResource<Style>(typeof(GridViewColumnHeader));
+                Style style = new Style(typeof(GridViewColumnHeader), defaultGridViewColumnHeaderStyle);
+                var setter = new Setter(GridViewColumnHeader.MinWidthProperty, GetColumnMinWidth(column).Value);
+                style.Setters.Add(setter);
+                column.HeaderContainerStyle = style;
+            }
+        }
+
+
+        public static Thickness GetColumnHeaderPadding(DependencyObject obj) => (Thickness)obj.GetValue(ColumnHeaderPaddingProperty);
+        internal static void SetColumnHeaderPadding(DependencyObject obj, Thickness value) => obj.SetValue(ColumnHeaderPaddingProperty, value);
+        /// <summary>
+        /// 标识<see cref="GridViewColumnHeader"/>的内边距
+        /// 暂时无效
+        /// </summary>
+        public static readonly DependencyProperty ColumnHeaderPaddingProperty =
+            DependencyProperty.RegisterAttached("ColumnHeaderPadding", typeof(Thickness), typeof(GridViewColumnAssistant), new PropertyMetadata(default(Thickness), OnColumnHeaderPaddingChanged));
+
+        private static void OnColumnHeaderPaddingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is GridViewColumn column)
+            {
+                var defaultGridViewColumnHeaderStyle = ResourceHelper.GetResource<Style>(typeof(GridViewColumnHeader));
+                Style style = new Style(typeof(GridViewColumnHeader), defaultGridViewColumnHeaderStyle);
+                var setter = new Setter(ColumnHeaderPaddingProperty, GetColumnHeaderPadding(column));
+                //var setter = new Setter(GridViewColumnHeader.PaddingProperty, GetColumnHeaderPadding(column));
+
+                //var setter = (Setter)style.Setters.FirstOrDefault(setter => ((Setter)setter).Property == GridViewColumnHeader.PaddingProperty)!;
+                //setter.Value = GetColumnHeaderPadding(column);
+
+                style.Setters.Add(setter);
+                column.HeaderContainerStyle = style;
+            }
+        }
+    }
+
+
+    /// <summary>
+    /// 表示<see cref="ListView"/>的附加属性基类
     /// </summary>
     public class ListViewAssistant
     {
+        public static double GetColumnHeaderHeight(DependencyObject obj) => (double)obj.GetValue(ColumnHeaderHeightProperty);
+        public static void SetColumnHeaderHeight(DependencyObject obj, double value) => obj.SetValue(ColumnHeaderHeightProperty, value);
+        /// <summary>
+        /// 标识<see cref="GridViewColumnHeader"/>的标头高度
+        /// </summary>
+        public static readonly DependencyProperty ColumnHeaderHeightProperty =
+            DependencyProperty.RegisterAttached("ColumnHeaderHeight", typeof(double), typeof(ListViewAssistant), new PropertyMetadata(ValueBoxes.Double30Box));
+
+
+        public static bool GetIsColumnHeaderFontWeight(DependencyObject obj) => (bool)obj.GetValue(IsColumnHeaderFontWeightProperty);
+        public static void SetIsColumnHeaderFontWeight(DependencyObject obj, bool value) => obj.SetValue(IsColumnHeaderFontWeightProperty, ValueBoxes.BooleanBox(value));
+        /// <summary>
+        /// 表示<see cref="GridViewColumnHeader"/>是否采用粗体
+        /// </summary>
+        public static readonly DependencyProperty IsColumnHeaderFontWeightProperty =
+            DependencyProperty.RegisterAttached("IsColumnHeaderFontWeight", typeof(bool), typeof(ListViewAssistant), new PropertyMetadata(ValueBoxes.FalseBox));
+
+
         public static Thickness GetListViewItemPadding(DependencyObject obj) => (Thickness)obj.GetValue(ListViewItemPaddingProperty);
         public static void SetListViewItemPadding(DependencyObject obj, Thickness value) => obj.SetValue(ListViewItemPaddingProperty, value);
+        /// <summary>
+        /// 表示<see cref="ListViewItem"/>的内边距
+        /// </summary>
         public static readonly DependencyProperty ListViewItemPaddingProperty =
             DependencyProperty.RegisterAttached("ListViewItemPadding", typeof(Thickness), typeof(ListViewAssistant), new PropertyMetadata(default(Thickness)));
     }

diff --git a/CookPopularControl/Controls/Thumb/GridViewColumThumb.cs b/CookPopularControl/Controls/Thumb/GridViewColumThumb.cs
@@ -1,4 +1,5 @@
-using System.Windows.Input;
+using System.Windows;
+using System.Windows.Input;
 
 
 
@@ -24,7 +25,6 @@ protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
         protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
         {
             base.OnMouseLeftButtonUp(e);
-
             Mouse.OverrideCursor = null;
         }
     }

diff --git a/CookPopularControl/CookPopularControl.xml b/CookPopularControl/CookPopularControl.xml
diff --git a/CookPopularControl/Themes/BaseStyle/ListBoxBaseStyle.xaml b/CookPopularControl/Themes/BaseStyle/ListBoxBaseStyle.xaml
@@ -216,7 +216,7 @@
                                       pc:ScrollBarAssistant.HorizontalScrollBarHeight="{TemplateBinding pc:ScrollBarAssistant.HorizontalScrollBarHeight}"
                                       pc:ScrollBarAssistant.IsShowScrollBarRepeatButton="{TemplateBinding pc:ScrollBarAssistant.IsShowScrollBarRepeatButton}"
                                       pc:ScrollBarAssistant.VerticalScrollBarWidth="{TemplateBinding pc:ScrollBarAssistant.VerticalScrollBarWidth}">
-                            <!--<StackPanel SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsItemsHost="True" />-->
+                            <!--<StackPanel x:Name="ItemsPresenter" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsItemsHost="True" />-->
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
                     </Border>