From f52302d69d60ce15b0d5b100e30082c5a6e9caa1 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期五, 03 七月 2020 18:38:44 +0800
Subject: [PATCH] merge
---
src/Bro.UI.Model.Winform/Element/PointIndicator.cs | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/Bro.UI.Model.Winform/Element/PointIndicator.cs b/src/Bro.UI.Model.Winform/Element/PointIndicator.cs
index adb66bb..9559b7d 100644
--- a/src/Bro.UI.Model.Winform/Element/PointIndicator.cs
+++ b/src/Bro.UI.Model.Winform/Element/PointIndicator.cs
@@ -38,21 +38,6 @@
}
#region ElementBase
- public override void Calculate(Bitmap image)
- {
- }
-
- public override void Calculate(IntPtr imagePtr, int ptrSize, int imageWidth, int imageHeight)
- {
- }
-
- public override void Calculate(string imagePath)
- {
- }
-
- public override void CalculateBaseRectangle()
- {
- }
public override object Clone()
{
@@ -68,12 +53,12 @@
public override void Draw(Graphics g)
{
- g.DrawEllipse(Pen, new RectangleF(Center.X - Radius, Center.Y - Radius, Radius * 2, Radius * 2));
- g.DrawLine(Pen, Center.X, Center.Y - Radius, Center.X, Center.Y + Radius);
- g.DrawLine(Pen, Center.X - Radius, Center.Y, Center.X + Radius, Center.Y);
+ g.DrawEllipse(Pen, new RectangleF((float)Center.X - Radius, (float)Center.Y - Radius, Radius * 2, Radius * 2));
+ g.DrawLine(Pen, (float)Center.X, (float)Center.Y - Radius, (float)Center.X, (float)Center.Y + Radius);
+ g.DrawLine(Pen, (float)Center.X - Radius, (float)Center.Y, (float)Center.X + Radius, (float)Center.Y);
string info = GetDisplayText();
- g.DrawString(info, new Font("NewRoman", FontSize), new SolidBrush(Pen.Color), new PointF(Center.X - Radius - FontDistance, Center.Y - Radius - FontDistance));
+ g.DrawString(info, Font, new SolidBrush(Pen.Color), new PointF((float)Center.X - Radius - FontDistance, (float)Center.Y - Radius - FontDistance));
}
public override string GetDisplayText()
--
Gitblit v1.8.0