diff --git a/ArmoredVehicle/FormMachineConfig.Designer.cs b/ArmoredVehicle/FormMachineConfig.Designer.cs index 1e6d139..1137f9f 100644 --- a/ArmoredVehicle/FormMachineConfig.Designer.cs +++ b/ArmoredVehicle/FormMachineConfig.Designer.cs @@ -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 // diff --git a/ArmoredVehicle/FormMachineConfig.cs b/ArmoredVehicle/FormMachineConfig.cs index e3f586a..1dbefa1 100644 --- a/ArmoredVehicle/FormMachineConfig.cs +++ b/ArmoredVehicle/FormMachineConfig.cs @@ -18,7 +18,7 @@ namespace ArmoredVehicle DrawingArmoredVehicle _machine = null; private Color? color; private Color? Dopcolor; - public event MachineDelegate EventAddMachine; + public event Action EventAddMachine; /// /// Конструктор /// @@ -49,11 +49,11 @@ namespace ArmoredVehicle pictureBoxObject.Image = bmp; } - public void AddEvent(MachineDelegate ev) + public void AddEvent(Action 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)); diff --git a/ArmoredVehicle/MachineDelegate.cs b/ArmoredVehicle/MachineDelegate.cs deleted file mode 100644 index 458366c..0000000 --- a/ArmoredVehicle/MachineDelegate.cs +++ /dev/null @@ -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); -}