diff --git a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs index 9bd986a..dde2026 100644 --- a/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/DrawningAirbus.cs @@ -82,7 +82,6 @@ public class DrawningAirbus _startPosY = _pictureHeight - _drawningAirbusHeight; } } - return true; } return false; @@ -100,20 +99,23 @@ public class DrawningAirbus { return; } + else + { + _startPosX = x; + _startPosY = y; - _startPosX = x; - _startPosY = y; - - if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) - { - _startPosX = _pictureWidth.Value - _drawningAirbusWidth; - } - if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) - { - _startPosY = _pictureHeight.Value - _drawningAirbusHeight; - } + if (_startPosX < 0) _startPosX = 0; + if (_startPosY < 0) _startPosY = 0; - + if (_startPosX + _drawningAirbusWidth > _pictureWidth.Value) + { + _startPosX = _pictureWidth.Value - _drawningAirbusWidth; + } + if (_startPosY + _drawningAirbusHeight > _pictureHeight.Value) + { + _startPosY = _pictureHeight.Value - _drawningAirbusHeight; + } + } } /// diff --git a/ProjectAirbus/ProjectAirbus/FormAirbus.cs b/ProjectAirbus/ProjectAirbus/FormAirbus.cs index f5fb646..e84ff77 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbus.cs @@ -54,7 +54,6 @@ namespace ProjectAirbus _drawningAirbus.SetPictureSize(pictureBoxAirbus.Width, pictureBoxAirbus.Height); _drawningAirbus.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); }