From 3322022068ab818912d6f5d9e5eb31f51cc639c2 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期四, 24 二月 2022 09:12:30 +0800
Subject: [PATCH] 添加配置文件的DataShift2

---
 src/Bro.UI.Model.Winform/UI/Canvas.cs |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/Bro.UI.Model.Winform/UI/Canvas.cs b/src/Bro.UI.Model.Winform/UI/Canvas.cs
index 40f2b3c..9b7102f 100644
--- a/src/Bro.UI.Model.Winform/UI/Canvas.cs
+++ b/src/Bro.UI.Model.Winform/UI/Canvas.cs
@@ -77,7 +77,7 @@
             set => stsStatus.Visible = value;
         }
 
-        private async void OnMouseLocationUpdated(Point screenPoint, Point imagePoint, string colorDesc)
+        private void OnMouseLocationUpdated(Point screenPoint, Point imagePoint, string colorDesc)
         {
             //await Task.Run(() => tsslLocation.Text = $"灞忓箷鍧愭爣X锛歿screenPoint.X}锛孻锛歿screenPoint.Y}    鍥剧墖鍧愭爣X锛歿imagePoint.X}锛孻锛歿imagePoint.Y}   棰滆壊锛歿colorDesc}");
             this.Invoke(new Action(() =>
@@ -237,7 +237,7 @@
             {
                 ele.IsEnabled = e.CheckedState;
             }
-            OnElementChanged();
+            OnElementChanged(null);
         }
 
         private void dgElements_SelectionChanged(object sender, EventArgs e)
@@ -270,7 +270,7 @@
 
         private void Elements_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
-            OnElementChanged();
+            OnElementChanged(null);
 
             foreach (IShapeElement ele in Elements)
             {
@@ -281,14 +281,17 @@
 
         private void Ele_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            OnElementChanged();
+            OnElementChanged(sender as IShapeElement);
         }
 
-        private void OnElementChanged()
+        private void OnElementChanged(IShapeElement ele)
         {
+            if (ele != null)
+                OnElementChangedHandle?.Invoke(ele);
+
             if (InvokeRequired)
             {
-                Invoke(new Action(() => OnElementChanged()));
+                Invoke(new Action(() => OnElementChanged(ele)));
             }
             else
             {
@@ -381,17 +384,17 @@
 
         private void tsmiUnselectElements_Click(object sender, EventArgs e)
         {
-            if (MouseState == MouseState.SelectedElement)
-            {
-                MouseState = MouseState.Normal;
+            //if (MouseState == MouseState.SelectedElement)
+            //{
+            //    MouseState = MouseState.Normal;
 
-                //Elements.ForEach(ele =>
-                foreach (IShapeElement ele in Elements)
-                {
-                    ele.State = ElementState.Normal;
-                }
-                //);
-            }
+            //    //Elements.ForEach(ele =>
+            //    foreach (IShapeElement ele in Elements)
+            //    {
+            //        ele.State = ElementState.Normal;
+            //    }
+            //    //);
+            //}
         }
         #endregion
 
@@ -543,5 +546,9 @@
             }
         }
         #endregion
+
+        #region 浜嬩欢
+        public event Action<IShapeElement> OnElementChangedHandle;
+        #endregion
     }
 }

--
Gitblit v1.8.0