From e396498be156c454bb51afee51377827ab07108f Mon Sep 17 00:00:00 2001 From: Salikh Date: Tue, 28 Nov 2023 18:42:06 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AirBomber/DrawningAirBomber.cs | 7 +++++++ AirBomber/DrawningBomber.cs | 4 ++++ AirBomber/EntityAirBomber.cs | 6 +++++- AirBomber/EntityBomber.cs | 4 ++++ AirBomber/FormBomberConfig.cs | 20 ++++++++------------ 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/AirBomber/DrawningAirBomber.cs b/AirBomber/DrawningAirBomber.cs index 937c5af..74b3379 100644 --- a/AirBomber/DrawningAirBomber.cs +++ b/AirBomber/DrawningAirBomber.cs @@ -65,5 +65,12 @@ namespace AirBomber.DrawningObjects } base.DrawBomber(g); } + public void setAddColor(Color color) + { + if (EntityBomber is EntityAirBomber airbomber) + { + airbomber.setAddColor(color); + } + } } } diff --git a/AirBomber/DrawningBomber.cs b/AirBomber/DrawningBomber.cs index fadb038..e7c551f 100644 --- a/AirBomber/DrawningBomber.cs +++ b/AirBomber/DrawningBomber.cs @@ -162,5 +162,9 @@ namespace AirBomber.DrawningObjects wing_2.CloseFigure(); g.DrawPath(Pens.Black, wing_2); } + public void setColor(Color color) + { + EntityBomber.setColor(color); + } } } diff --git a/AirBomber/EntityAirBomber.cs b/AirBomber/EntityAirBomber.cs index bc994ba..9c7cfd5 100644 --- a/AirBomber/EntityAirBomber.cs +++ b/AirBomber/EntityAirBomber.cs @@ -2,7 +2,7 @@ { public class EntityAirBomber : EntityBomber { - public Color DopColor { get; set; } + public Color DopColor { get; private set; } public bool Toplivo { get; private set; } public bool Rocket { get; private set; } @@ -12,5 +12,9 @@ Toplivo = toplivo; Rocket = ropcket; } + public void setAddColor(Color color) + { + DopColor = color; + } } } diff --git a/AirBomber/EntityBomber.cs b/AirBomber/EntityBomber.cs index 9273efc..35434f1 100644 --- a/AirBomber/EntityBomber.cs +++ b/AirBomber/EntityBomber.cs @@ -19,5 +19,9 @@ namespace AirBomber.Entities Weight = weight; BodyColor = bodycolor; } + public void setColor(Color color) + { + BodyColor = color; + } } } diff --git a/AirBomber/FormBomberConfig.cs b/AirBomber/FormBomberConfig.cs index 745668a..4ba33f8 100644 --- a/AirBomber/FormBomberConfig.cs +++ b/AirBomber/FormBomberConfig.cs @@ -101,14 +101,12 @@ namespace AirBomber private void LabelBaseColor_DragDrop(object sender, DragEventArgs e) { - if (_bomber != null) + if (_bomber is DrawningBomber entityAirBomber) { - if (e.Data.GetDataPresent(typeof(Color))) - { - _bomber.EntityBomber.BodyColor = (Color)e.Data.GetData(typeof(Color)); - } - DrawBomber(); + labelColor.BackColor = (Color)e.Data.GetData(typeof(Color)); + _bomber.setColor((Color)e.Data.GetData(typeof(Color))); } + DrawBomber(); } private void LabelColor_DragEnter(object sender, DragEventArgs e) @@ -132,14 +130,12 @@ namespace AirBomber private void labelAddBoxColor_DragDrop(object sender, DragEventArgs e) { - if (_bomber != null && _bomber.EntityBomber is EntityAirBomber entityAirBomber) + if (_bomber is DrawningAirBomber entityAirBomber) { - if (e.Data.GetDataPresent(typeof(Color))) - { - entityAirBomber.DopColor = (Color)e.Data.GetData(typeof(Color)); - } - DrawBomber(); + labelDopColor.BackColor = (Color)e.Data.GetData(typeof(Color)); + entityAirBomber.setAddColor((Color)e.Data.GetData(typeof(Color))); } + DrawBomber(); } } }