From 3d3b28e446519da3a2630103c5c168737242feac Mon Sep 17 00:00:00 2001
From: Sunny <yhuse@163.com>
Date: Mon, 11 Jul 2022 23:22:32 +0800
Subject: [PATCH] =?UTF-8?q?*=20UIDataGridView:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E8=BE=B9=E6=A1=86=E7=BA=BF=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SunnyUI/Controls/UIDataGridView.cs | 35 ++++++++++++++++++++----------
 SunnyUI/Controls/UIListBox.cs      |  9 ++++----
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/SunnyUI/Controls/UIDataGridView.cs b/SunnyUI/Controls/UIDataGridView.cs
index 272c8945..f1d0cd82 100644
--- a/SunnyUI/Controls/UIDataGridView.cs
+++ b/SunnyUI/Controls/UIDataGridView.cs
@@ -40,6 +40,7 @@
  *                    RowTemplate.Height 设置为高度
  * 2022-06-22: V3.2.0 删除 ShowRect、ShowGridLine、RowHeight三个属性
  * 2022-07-11: V3.2.1 修复一处滚动条的显示位置
+ * 2022-07-11: V3.2.1 增加滚动条边框线的设置
 ******************************************************************************/
 
 using System;
@@ -439,10 +440,10 @@ namespace Sunny.UI
                 VBar.Height = Height - 2;
                 VBar.BringToFront();
 
-                HBar.Left = 2;
+                HBar.Left = 1;
                 HBar.Height = ScrollBarInfo.HorizontalScrollBarHeight() + 1;
-                HBar.Width = Width - (VBar.Visible ? VBar.Width : 0) - 3;
-                HBar.Top = Height - HBar.Height - 2;
+                HBar.Width = Width - (VBar.Visible ? VBar.Width : 0) - 2;
+                HBar.Top = Height - HBar.Height - 1;
                 HBar.BringToFront();
             }
             else
@@ -555,27 +556,25 @@ namespace Sunny.UI
             StripeEvenColor = uiColor.GridStripeEvenColor;
             StripeOddColor = uiColor.GridStripeOddColor;
 
-            HBar.FillColor = VBar.FillColor = uiColor.GridBarFillColor;
-            HBar.ForeColor = VBar.ForeColor = uiColor.GridBarForeColor;
-            VBar.RectColor = uiColor.RectColor;
-
             if (HBar != null)
             {
-                HBar.ForeColor = uiColor.PrimaryColor;
+                HBar.ForeColor = uiColor.GridBarForeColor;
                 HBar.HoverColor = uiColor.ButtonFillHoverColor;
                 HBar.PressColor = uiColor.ButtonFillPressColor;
                 HBar.FillColor = uiColor.GridBarFillColor;
-                scrollBarColor = uiColor.PrimaryColor;
+                //HBar.RectColor = uiColor.RectColor;
+                scrollBarColor = uiColor.GridBarForeColor;
                 scrollBarBackColor = uiColor.GridBarFillColor;
             }
 
             if (VBar != null)
             {
-                VBar.ForeColor = uiColor.PrimaryColor;
+                VBar.ForeColor = uiColor.GridBarForeColor;
                 VBar.HoverColor = uiColor.ButtonFillHoverColor;
                 VBar.PressColor = uiColor.ButtonFillPressColor;
                 VBar.FillColor = uiColor.GridBarFillColor;
-                scrollBarColor = uiColor.PrimaryColor;
+                scrollBarRectColor = VBar.RectColor = uiColor.RectColor;
+                scrollBarColor = uiColor.GridBarForeColor;
                 scrollBarBackColor = uiColor.GridBarFillColor;
             }
         }
@@ -802,6 +801,20 @@ namespace Sunny.UI
             }
         }
 
+        private Color scrollBarRectColor = Color.FromArgb(80, 160, 255);
+
+        public Color ScrollBarRectColor
+        {
+            get => scrollBarRectColor;
+            set
+            {
+                scrollBarRectColor = value;
+                VBar.RectColor = value;
+                _style = UIStyle.Custom;
+                Invalidate();
+            }
+        }
+
         private Color scrollBarBackColor = Color.FromArgb(243, 249, 255);
 
         /// <summary>
diff --git a/SunnyUI/Controls/UIListBox.cs b/SunnyUI/Controls/UIListBox.cs
index e9860d08..780498e7 100644
--- a/SunnyUI/Controls/UIListBox.cs
+++ b/SunnyUI/Controls/UIListBox.cs
@@ -451,12 +451,13 @@ namespace Sunny.UI
 
             if (bar != null)
             {
-                bar.ForeColor = uiColor.PrimaryColor;
+                bar.ForeColor = uiColor.ListBarForeColor;
                 bar.HoverColor = uiColor.ButtonFillHoverColor;
                 bar.PressColor = uiColor.ButtonFillPressColor;
-                bar.FillColor = uiColor.GridBarFillColor;
-                scrollBarColor = uiColor.PrimaryColor;
-                scrollBarBackColor = uiColor.GridBarFillColor;
+                bar.FillColor = uiColor.ListBarFillColor;
+
+                scrollBarColor = uiColor.ListBarForeColor;
+                scrollBarBackColor = uiColor.ListBarFillColor;
             }
 
             hoverColor = uiColor.ListItemHoverColor;