From e98de937b28d42493de5dea6365c853d6b412d3c Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期五, 11 四月 2025 17:06:10 +0800
Subject: [PATCH] 解决冲突
---
WinFrmUI/DPumpHydr.WinFrmUI.RLT/Forms/Container/NightForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Forms/Container/NightForm.cs b/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Forms/Container/NightForm.cs
index 7eaa13a..45623a8 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Forms/Container/NightForm.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.RLT/Forms/Container/NightForm.cs
@@ -243,15 +243,15 @@
// using (var brush = new(ColorTranslator.FromHtml("#0000FF")))
// g.FillRectangle(brush, new Rectangle(Width - 138, 0, 46, 31));
}
-
+ public System.Drawing.Image AppIcon { get; set; }
private void DrawTitleBarIcon(Graphics g)
{
- if (_DrawIcon)
+ if (_DrawIcon && AppIcon != null)
{
titleBarStringLeft = _TextAlignment == Alignment.Left ? 33 : 5;
Rectangle iconRect = new(10, 7, 16, 16);
-
- g.DrawIcon(FindForm().Icon, iconRect);
+ g.DrawImage(AppIcon, iconRect);
+ //g.DrawIcon(FindForm().Icon, iconRect);
}
else
{
--
Gitblit v1.9.3