clear empty parametr of tank and change delegate
This commit is contained in:
parent
1370138f14
commit
654a7f8ffd
2
ArmoredVehicle/FormMachineConfig.Designer.cs
generated
2
ArmoredVehicle/FormMachineConfig.Designer.cs
generated
@ -265,7 +265,7 @@
|
||||
this.labelDopColor.Text = "Доп. цвет";
|
||||
this.labelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
|
||||
this.labelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.labelDopColor_DragDrop);
|
||||
this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelColor_DragEnter);
|
||||
this.labelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.labelDopColor_DragEnter);
|
||||
//
|
||||
// labelColor
|
||||
//
|
||||
|
@ -18,7 +18,7 @@ namespace ArmoredVehicle
|
||||
DrawingArmoredVehicle _machine = null;
|
||||
private Color? color;
|
||||
private Color? Dopcolor;
|
||||
public event MachineDelegate EventAddMachine;
|
||||
public event Action<DrawingArmoredVehicle> EventAddMachine;
|
||||
/// <summary>
|
||||
/// Конструктор
|
||||
/// </summary>
|
||||
@ -49,11 +49,11 @@ namespace ArmoredVehicle
|
||||
pictureBoxObject.Image = bmp;
|
||||
}
|
||||
|
||||
public void AddEvent(MachineDelegate ev)
|
||||
public void AddEvent(Action<DrawingArmoredVehicle> ev)
|
||||
{
|
||||
if(EventAddMachine == null)
|
||||
{
|
||||
EventAddMachine = new MachineDelegate(ev);
|
||||
EventAddMachine = new (ev);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -126,6 +126,22 @@ namespace ArmoredVehicle
|
||||
}
|
||||
}
|
||||
|
||||
private void labelDopColor_DragEnter(object sender, DragEventArgs e)
|
||||
{
|
||||
if(_machine is DrawingTank)
|
||||
{
|
||||
if (e.Data.GetDataPresent(typeof(Color)))
|
||||
{
|
||||
e.Effect = DragDropEffects.Copy;
|
||||
}
|
||||
else
|
||||
{
|
||||
e.Effect = DragDropEffects.None;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void labelDopColor_DragDrop(object sender, DragEventArgs e)
|
||||
{
|
||||
var color = (Color)e.Data.GetData(typeof(Color));
|
||||
|
@ -1,10 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace ArmoredVehicle
|
||||
{
|
||||
public delegate void MachineDelegate(DrawingArmoredVehicle machine);
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user