From 09c2dc22705b00ceeec7382efa84e22b7b054c2f Mon Sep 17 00:00:00 2001 From: ruanyi Date: Mon, 4 Jan 2021 15:15:24 +0800 Subject: [PATCH 1/2] fix crash when image paste --- Source/HCImageItem.cs | 1 + Source/HCRichData.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/HCImageItem.cs b/Source/HCImageItem.cs index d982f13..37f048f 100644 --- a/Source/HCImageItem.cs +++ b/Source/HCImageItem.cs @@ -87,6 +87,7 @@ namespace HC.View public HCImageItem(HCCustomData aOwnerData, int aWidth, int aHeight) : base(aOwnerData, aWidth, aHeight) { + FImage = new Bitmap(aWidth, aHeight); StyleNo = HCStyle.Image; FShapeManager = new HCShapeManager(); Clear(); diff --git a/Source/HCRichData.cs b/Source/HCRichData.cs index b40984a..972d9d7 100644 --- a/Source/HCRichData.cs +++ b/Source/HCRichData.cs @@ -564,7 +564,7 @@ namespace HC.View switch (aStyleNo) { case HCStyle.Image: - Result = new HCImageItem(this, 0, 0); + Result = new HCImageItem(this, 100, 100); break; case HCStyle.Table: -- Gitee From d372059dd67acbbdbf0ee4aaf1de879187fe3d1d Mon Sep 17 00:00:00 2001 From: ruanyi Date: Mon, 4 Jan 2021 15:16:03 +0800 Subject: [PATCH 2/2] fix crash when context menu on floating item --- Demo/HCView/frmHCViewDemo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Demo/HCView/frmHCViewDemo.cs b/Demo/HCView/frmHCViewDemo.cs index c567248..d326cc8 100644 --- a/Demo/HCView/frmHCViewDemo.cs +++ b/Demo/HCView/frmHCViewDemo.cs @@ -591,7 +591,7 @@ namespace HCViewDemo if (vTopData == null) vTopData = vActiveData; - mniTable.Enabled = vActiveItem.StyleNo == HCStyle.Table; + mniTable.Enabled = vActiveItem != null && vActiveItem.StyleNo == HCStyle.Table; if (mniTable.Enabled) { HCTableItem vTableItem = vActiveItem as HCTableItem; -- Gitee