190930

Pilz.UI/PaintingControl/DefaultDrawMethodes.vb

@@ -143,20 +143,18 @@ Public Class DefaultDrawMethodes
     Public Shared Sub DrawTriangle(e As PaintingObjectPaintEventArgs)
         Dim obj As PaintingObject = e.PaintingObject
 
+        Dim p1 As New Point(obj.Size.Width / 2 + e.X, e.Y)
+        Dim p2 As New Point(e.X, e.Y + obj.Size.Height)
+        Dim p3 As New Point(e.X + obj.Size.Width, e.Y + obj.Size.Height)
+
         If obj.EnableFill Then
             Dim b As New SolidBrush(obj.FillColor)
-            Dim p1 As New Point(obj.Size.Width / 2 + e.X, e.Y)
-            Dim p2 As New Point(e.X, e.Y + obj.Size.Height)
-            Dim p3 As New Point(e.X + obj.Size.Width, e.Y + obj.Size.Height)
             e.Graphics.FillPolygon(b, {p1, p2, p3})
         End If
 
         If obj.EnableOutline Then
             Dim lw As Single = obj.OutlineThicknes
             Dim p As New Pen(obj.OutlineColor, obj.OutlineThicknes) With {.DashStyle = obj.OutlineDashStyle, .Alignment = PenAlignment.Inset}
-            Dim p1 As New Point(obj.Size.Width / 2 + e.X, e.Y)
-            Dim p2 As New Point(e.X, e.Y + obj.Size.Height)
-            Dim p3 As New Point(e.X + obj.Size.Width, e.Y + obj.Size.Height)
             e.Graphics.DrawPolygon(p, {p1, p2, p3})
         End If
     End Sub
@@ -225,10 +223,10 @@ Public Class DefaultDrawMethodes
     End Sub
 
     Public Shared Sub DrawAreaSelection(e As PaintEventArgs, pc As PaintingControl, startMousePos As PointF, lastMousePos As PointF)
-        Dim p As New Pen(pc.AreaSelectionColor)
-        p.DashStyle = DashStyle.DashDot
-        p.Width = 3
         Dim rectToDraw As RectangleF = HelpfulDrawingFunctions.GetRectangle(startMousePos, lastMousePos)
+        Dim p As New Pen(pc.AreaSelectionColor)
+        p.DashStyle = If(startMousePos.X >= lastMousePos.X, DashStyle.DashDot, DashStyle.Solid)
+        p.Width = 3
         e.Graphics.DrawRectangle(p, rectToDraw.X, rectToDraw.Y, rectToDraw.Width, rectToDraw.Height)
     End Sub