From 06491f8e2a040ee60bc32c1e0c2962e5e4bbbed5 Mon Sep 17 00:00:00 2001 From: lindexi Date: Fri, 1 Dec 2023 16:54:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheabeloleYiharjelke/MainWindow.xaml.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CheabeloleYiharjelke/CheabeloleYiharjelke/MainWindow.xaml.cs b/CheabeloleYiharjelke/CheabeloleYiharjelke/MainWindow.xaml.cs index 8ddaaaa25d..28097a0688 100644 --- a/CheabeloleYiharjelke/CheabeloleYiharjelke/MainWindow.xaml.cs +++ b/CheabeloleYiharjelke/CheabeloleYiharjelke/MainWindow.xaml.cs @@ -65,7 +65,7 @@ private void Canvas_MouseDown(object sender, MouseButtonEventArgs e) _lastPoint = position; _lastGeometry = PathGeometry.CreateFromGeometry(Geometry.Parse( - "M19.25,13.75L61,0L106.75,16.75L123,58.5L104.75,106.5L61,117.25L13.75,101.5L0,58.75z")); + "M2.6399687469006494,-1.1920974429813214E-08L2.2400134327867818,0.24997633695602417Q-3.3600001953013816,11.449993121624459 5.039970278460487,29.599998462200233C13.039985438108488,48.79998015165296 17.040001988695053,59.199980151653335 33.84000198869501,71.1999839663506C50.64000198869496,83.19998778104787 61.740001988694985,89.74998396635056 74.63996874690065,90.39999998807906C87.53993550510631,91.05001600980756 97.98997528581413,68.74997633695602 98.48999817399772,57.749976336956024C98.99002106218131,46.749976336956024 100.49000198869498,26.749976336956024 69.03996874690051,23.19999998807907C37.58993550510604,19.650023639202118 9.039968746900627,6.39999998807906 2.6399687469006494,-1.1920974429813214E-08z")); var bounds = _lastGeometry.Bounds; _lastGeometry.Transform = new TranslateTransform(position.X - bounds.Width / 2, position.Y - bounds.Height / 2); } @@ -266,8 +266,15 @@ private void Connect(Point position) _drawingGroup = new DrawingGroup(); using (var drawingContext = _drawingGroup.Open()) { - drawingContext.DrawGeometry(null, new Pen(Brushes.Black, 1), _lastGeometry); - drawingContext.DrawGeometry(null, new Pen(Brushes.Black, 1), currentGeometry); + var fillBrush = new SolidColorBrush(Colors.Black) + { + Opacity = 0.6 + }; + + fillBrush = Brushes.Black; + + drawingContext.DrawGeometry(fillBrush, new Pen(Brushes.Black, 1), _lastGeometry); + drawingContext.DrawGeometry(fillBrush, new Pen(Brushes.Black, 1), currentGeometry); foreach (var point in currentGeometryPoint) { @@ -284,7 +291,7 @@ private void Connect(Point position) var streamGeometry = new StreamGeometry(); using (var streamGeometryContext = streamGeometry.Open()) { - streamGeometryContext.BeginFigure(lastGeometryLeftTopPoint.Value, false, true); + streamGeometryContext.BeginFigure(lastGeometryLeftTopPoint.Value, true, true); streamGeometryContext.PolyLineTo(new[] { currentGeometryLeftTopPoint.Value, @@ -293,7 +300,7 @@ private void Connect(Point position) }, true, false); } - drawingContext.DrawGeometry(null, new Pen(Brushes.Black, 1), streamGeometry); + drawingContext.DrawGeometry(fillBrush, new Pen(Brushes.Black, 1), streamGeometry); } }