diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs index 6518012..2f4da10 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs @@ -15,11 +15,9 @@ namespace ProjectAirplaneWithRadar public partial class FormAirplaneConfig : Form { DrawningAirplane? _airplane = null; - Action? EventAddAirplane; private readonly int PictureWidth; private readonly int PictureHeight; - public void AddEvent(Action? ev) { if (EventAddAirplane == null) @@ -31,7 +29,6 @@ namespace ProjectAirplaneWithRadar EventAddAirplane += ev; } } - public FormAirplaneConfig(int width, int height) { InitializeComponent(); @@ -49,7 +46,6 @@ namespace ProjectAirplaneWithRadar PictureWidth = width; PictureHeight = height; } - public void DrawAirplane() { Bitmap bmp = new Bitmap(pictureBox.Width, pictureBox.Height); @@ -58,12 +54,10 @@ namespace ProjectAirplaneWithRadar _airplane?.DrawTransport(gr); pictureBox.Image = bmp; } - private void PanelColor_MouseDown(object sender, MouseEventArgs e) { (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor, DragDropEffects.Move | DragDropEffects.Copy); } - private void allowPanel_DragDrop(object sender, DragEventArgs e) { switch (e.Data?.GetData(DataFormats.Text).ToString()) @@ -80,9 +74,7 @@ namespace ProjectAirplaneWithRadar colorLabel.BackColor = Color.Empty; addColorLabel.BackColor = Color.Empty; DrawAirplane(); - } - private void allowPanel_DragEnter(object sender, DragEventArgs e) { if (e.Data?.GetDataPresent(DataFormats.Text) ?? false) @@ -93,20 +85,16 @@ namespace ProjectAirplaneWithRadar { e.Effect = DragDropEffects.None; } - } - private void addButton_Click(object sender, EventArgs e) { EventAddAirplane?.Invoke(_airplane); Close(); } - private void LabelObject_MouseDown(object sender, MouseEventArgs e) { (sender as Label)?.DoDragDrop((sender as Label)?.Name, DragDropEffects.Move | DragDropEffects.Copy); } - private void colorLabel_DragDrop(object sender, DragEventArgs e) { if (_airplane == null) @@ -115,7 +103,6 @@ namespace ProjectAirplaneWithRadar _airplane.ChangeColor(colorLabel.BackColor); DrawAirplane(); } - private void colorLabel_DragEnter(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(typeof(Color))) @@ -127,7 +114,6 @@ namespace ProjectAirplaneWithRadar e.Effect = DragDropEffects.None; } } - private void addColorLabel_DragDrop(object sender, DragEventArgs e) { if ((_airplane == null) || (_airplane is DrawningAirplaneWithRadar == false)) @@ -136,7 +122,6 @@ namespace ProjectAirplaneWithRadar ((DrawningAirplaneWithRadar)_airplane).ChangeAddColor(addColorLabel.BackColor); DrawAirplane(); } - private void addColorLabel_DragEnter(object sender, DragEventArgs e) { if (e.Data.GetDataPresent(typeof(Color)))