From b825d70578b0ddf6d479569887c194f919795dad Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/DMap.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/DMap.cs b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/DMap.cs
index 0bfaca2..8eddc78 100644
--- a/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/DMap.cs
+++ b/WinFrmUI/PBS.WinFrmUI.Hydro/99-map-view/DMap.cs
@@ -1,11 +1,11 @@
锘�
namespace HydroUI
{
- public partial class DMap : XtraPanel
+ public partial class DMap : XtraUserControl
{
-
+
public TContainer TC = new TContainer();
-
+
/// <summary>
/// 鍦板浘閫夐」
/// </summary>
@@ -32,7 +32,7 @@
{
get { return TC.template; }
}
-
+
private bool _needPaintAll;
private Bitmap buffer;
@@ -60,7 +60,7 @@
DoubleBuffered = true;
}
- //琛ュ厖鍙傛暟
+ //琛ュ厖鍙傛暟
public void Init(TContainer TC, DrawDelegate[] Draws, MouseDelegate[] MouseEvents)
{
this.TC = TC;
@@ -73,7 +73,7 @@
this.onMouseUp = MouseEvents[2];
this.onMouseWheel = MouseEvents[3];
this.Inited = true;
- this.Status=DrawingStatus.Ready;
+ this.Status = DrawingStatus.Ready;
}
protected override void OnPaint(PaintEventArgs e)
@@ -134,9 +134,14 @@
if (Inited) onMouseUp(e);
}
- protected override void OnMouseWheelCore(MouseEventArgs ev)
+ private void InitializeComponent()
{
- base.OnMouseWheelCore(ev);
+
+ }
+
+ protected override void OnMouseWheel(MouseEventArgs ev)
+ {
+ base.OnMouseWheel(ev);
if (Inited) onMouseWheel(ev);
}
--
Gitblit v1.9.3