Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes & version bump

Browse Source
This commit is contained in:
Pascal
2024-06-10 13:15:24 +02:00
parent df8266fc40
commit e212f4021a
11 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Pilz.UI/Extensions.cs
View File

@@ -1,10 +1,8 @@
using System.Drawing;
namespace Pilz.UI;
namespace Pilz.UI;
public static class Extensions
{
public static Image? ToIcon(this Image image)
public static Icon? ToIcon(this Image image)
{
if (image is Bitmap bmp)
return Icon.FromHandle(bmp.GetHicon());

3
Pilz.UI/PaintingControl/PaintingControl.cs
View File

@@ -30,7 +30,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer
private new string Text { get; set; }
public PointF Offset { get; set; } = PointF.Empty;
public PaintingObjectList PaintingObjects { get; private set; } = new PaintingObjectList(this);
public PaintingObjectList PaintingObjects { get; private set; }
public bool VisibleForMouseEvents { get; set; } = true;
public bool AutoAreaSelection { get; set; } = true;
public bool AutoSingleSelection { get; set; } = true;
@@ -147,6 +147,7 @@ public class PaintingControl : UserControl, IPaintingObjectContainer
public PaintingControl()
{
PaintingObjects = new(this);
PaintingObjectResizing.CheckEnabled += PaintingObjectResizing_CheckEnabled;
DoubleBuffered = true;
KeyDown += CheckKeyDown;

11
Pilz.UI/PaintingControl/PaintingObject.cs
View File

@@ -64,8 +64,8 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer
[JsonProperty]
private bool _AutoAlignToGrid = false;
public bool MouseTransparency { get; set; } = false;
public PaintingObjectLayering Layering { get; private set; } = new PaintingObjectLayering(this);
public PaintingObjectList PaintingObjects { get; private set; } = new PaintingObjectList(_Parent) { EnableRaisingEvents = false };
public PaintingObjectLayering Layering { get; private set; }
public PaintingObjectList PaintingObjects { get; private set; }
[JsonIgnore]
public ulong ErrorsAtDrawing { get; private set; } = 0UL;
@@ -105,9 +105,11 @@ public class PaintingObject : ICloneable, IPaintingObjectContainer
public PaintingObject()
{
Layering = new(this);
PaintingObjects = new PaintingObjectList(_Parent) { EnableRaisingEvents = false };
}
public PaintingObject(PaintingObjectType @type)
public PaintingObject(PaintingObjectType @type) : this()
{
Type = type;
}
@@ -737,7 +739,7 @@ public class PaintingObjectList : List<PaintingObject>
internal PaintingControl MyParent { get; private set; }
internal bool EnableRaisingEvents { get; set; } = true;
[JsonIgnore]
public PaintingObjectListLayering Layering { get; private set; } = new PaintingObjectListLayering(this);
public PaintingObjectListLayering Layering { get; private set; }
public PaintingObjectList() : this(null)
{
@@ -745,6 +747,7 @@ public class PaintingObjectList : List<PaintingObject>
public PaintingObjectList(PaintingControl parent)
{
Layering = new(this);
MyParent = parent;
}

2
Pilz.UI/Pilz.UI.csproj
View File

@@ -9,7 +9,7 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<PropertyGroup>
<Version>2.0.0</Version>
<Version>2.1.0</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />