From 12200ec69e33881649974f31f270750ba6b15e1d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期二, 14 七月 2020 18:27:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/UI/KeyIndicator.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Bro.M071.Process/UI/KeyIndicator.cs b/src/Bro.M071.Process/UI/KeyIndicator.cs
index 2565ee3..24967a5 100644
--- a/src/Bro.M071.Process/UI/KeyIndicator.cs
+++ b/src/Bro.M071.Process/UI/KeyIndicator.cs
@@ -63,7 +63,10 @@
public override void Draw(Graphics g)
{
- g.DrawRectangle(Pen, DisplayRect);
+ if (ResultState == null)
+ {
+ g.DrawRectangle(Pen, DisplayRect);
+ }
RectangleF rectFill = new RectangleF(DisplayRect.X + 1, DisplayRect.Y + 1, DisplayRect.Width - 2, DisplayRect.Height - 2);
if (ResultState != null)
{
@@ -74,12 +77,11 @@
if (!ResultState.Value)
{
backColor = Color.Red;
- foreColor = Color.White;
+ //foreColor = Color.White;
}
g.FillRectangle(new SolidBrush(Color.FromArgb(85, backColor)), rectFill);
- g.DrawString(Text, Font, new SolidBrush(foreColor), (float)(DisplayRect.X + DisplayRect.Width / 2.0 - txtSize.Width / 2.0), (float)(DisplayRect.Y + DisplayRect.Height / 2.0 - txtSize.Height / 2.0));
-
+ g.DrawString(Text, Font, new SolidBrush(foreColor), (float)(DisplayRect.X + DisplayRect.Width / 2.0 - txtSize.Width / 2.0), (float)(DisplayRect.Y + DisplayRect.Height));
}
}
--
Gitblit v1.8.0