From bf6fe472fc6dc20e6d972a537625ea1c9597211d Mon Sep 17 00:00:00 2001 From: Extrimal Date: Tue, 14 Nov 2023 23:11:34 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D1=83=D0=BF=D0=B5=D1=80=20=D0=BF=D1=83?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=20laba5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AircraftCarrier/FormAircraftConfig.Designer.cs | 6 ++++-- AircraftCarrier/AircraftCarrier/FormAircraftConfig.cs | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/AircraftCarrier/AircraftCarrier/FormAircraftConfig.Designer.cs b/AircraftCarrier/AircraftCarrier/FormAircraftConfig.Designer.cs index 58a911c..e8c5fe2 100644 --- a/AircraftCarrier/AircraftCarrier/FormAircraftConfig.Designer.cs +++ b/AircraftCarrier/AircraftCarrier/FormAircraftConfig.Designer.cs @@ -100,7 +100,7 @@ panelRed.Location = new Point(15, 14); panelRed.Name = "panelRed"; panelRed.Size = new Size(38, 44); - panelRed.TabIndex = 0; + panelRed.TabIndex = 7; // // panelPurple // @@ -261,6 +261,7 @@ // // labelAdditionalColor // + labelAdditionalColor.AllowDrop = true; labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; labelAdditionalColor.Location = new Point(167, 13); labelAdditionalColor.Name = "labelAdditionalColor"; @@ -273,6 +274,7 @@ // // labelMainColor // + labelMainColor.AllowDrop = true; labelMainColor.BorderStyle = BorderStyle.FixedSingle; labelMainColor.Location = new Point(30, 12); labelMainColor.Name = "labelMainColor"; @@ -332,7 +334,6 @@ private CheckBox checkBoxRunWay; private NumericUpDown numericUpDownWeight; private NumericUpDown numericUpDownSpeed; - private Panel panelRed; private Panel panelPurple; private Panel panelBlack; private Panel panelGray; @@ -349,5 +350,6 @@ private Button buttonAdd; private Button buttonCancel; private Panel panelColor; + private Panel panelRed; } } \ No newline at end of file diff --git a/AircraftCarrier/AircraftCarrier/FormAircraftConfig.cs b/AircraftCarrier/AircraftCarrier/FormAircraftConfig.cs index 513b194..886847e 100644 --- a/AircraftCarrier/AircraftCarrier/FormAircraftConfig.cs +++ b/AircraftCarrier/AircraftCarrier/FormAircraftConfig.cs @@ -44,7 +44,6 @@ namespace AircraftCarrier EventAddAircraft += ev; } } - private void DrawAircraft() { Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); @@ -118,13 +117,10 @@ namespace AircraftCarrier ((EntityAircraftCarrier)_Aircraft.EntityAircraft).AdditionalColor = (Color)e.Data?.GetData(typeof(Color)); DrawAircraft(); } - private void buttonAdd_Click(object sender, EventArgs e) { EventAddAircraft?.Invoke(_Aircraft); Close(); } - - } }