From 997c87a7927ef6231ea59bac2338b91c2ce1399a Mon Sep 17 00:00:00 2001
From: gettterot <kasslesson@gmail.com>
Date: Wed, 21 Feb 2024 16:33:40 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=20SetPosition=20=D0=B8=20SetPictureSize?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectLiner/ProjectLiner/DrawningLiner.cs    | 54 ++++++++++++++-----
 .../ProjectLiner/FormLiner.Designer.cs        |  2 +
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/ProjectLiner/ProjectLiner/DrawningLiner.cs b/ProjectLiner/ProjectLiner/DrawningLiner.cs
index 76d0856..d5023a3 100644
--- a/ProjectLiner/ProjectLiner/DrawningLiner.cs
+++ b/ProjectLiner/ProjectLiner/DrawningLiner.cs
@@ -33,7 +33,7 @@ public class DrawningLiner
     /// <summary>
     /// Ширина прорисовки лайнера
     /// </summary>
-    private readonly int _drawningLinerWidth = 180;
+    private readonly int _drawningLinerWidth = 150;
 
     /// <summary>
     /// Высота прорисовки лайнера
@@ -68,9 +68,29 @@ public class DrawningLiner
     /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
     public bool SetPictureSize(int width, int height)
     {
-        _pictureWidth = width;
-        _pictureHeight = height;
-        return true;
+        if (width > _drawningLinerWidth && height > _drawningLinerHeight)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_startPosX != null && _startPosY != null)
+            {
+                if (_startPosX.Value < 0) 
+                    _startPosX = 0;
+                if (_startPosY.Value < 0)
+                    _startPosY = 0;
+                if (_startPosX.Value + _drawningLinerWidth > _pictureWidth)
+                {
+                    _startPosX = _pictureWidth - _drawningLinerWidth;
+                }
+                if (_startPosY.Value + _drawningLinerHeight > _pictureHeight)
+                {
+                    _startPosY = _pictureHeight - _drawningLinerHeight;
+                }
+            }
+
+            return true;
+        }
+        return false;
     }
 
     /// <summary>
@@ -84,16 +104,22 @@ public class DrawningLiner
         {
             return;
         }
-
-        if (x < 0 || y < 0)
+        else
         {
-            return;
+            _startPosX = x;
+            _startPosY = y;
+
+            if (_startPosX.Value + _drawningLinerWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth - _drawningLinerWidth;
+            }
+            if (_startPosY.Value + _drawningLinerHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight - _drawningLinerHeight;
+            }
         }
 
-        _startPosX = x;
-        _startPosY = y;
     }
-
     /// <summary>
 	/// Изменение направления перемещения
 	/// </summary>
@@ -169,7 +195,7 @@ public class DrawningLiner
         Point point1 = new Point(_startPosX.Value, _startPosY.Value + 80);
         Point point2 = new Point(_startPosX.Value + 50, _startPosY.Value + 130);
         Point point3 = new Point(_startPosX.Value + 135, _startPosY.Value + 130);
-        Point point4 = new Point(_startPosX.Value + 185, _startPosY.Value + 80);
+        Point point4 = new Point(_startPosX.Value + 155, _startPosY.Value + 80);
         Point[] curvePoints = { point1, point2, point3, point4 };
         g.FillPolygon(br, curvePoints);
 
@@ -185,9 +211,9 @@ public class DrawningLiner
         // шлюпки
         if (EntityLiner.Boats)
         {
-            g.FillEllipse(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 95, _startPosY.Value + 85, 30, 15);
-            g.FillEllipse(additionalBrush, _startPosX.Value + 130, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 40, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 75, _startPosY.Value + 85, 30, 15);
+            g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 85, 30, 15);
         }
 
         // труба
diff --git a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
index e55a740..94eb653 100644
--- a/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
+++ b/ProjectLiner/ProjectLiner/FormLiner.Designer.cs
@@ -39,6 +39,7 @@
             // 
             // pictureBoxLiner
             // 
+            pictureBoxLiner.BackColor = SystemColors.Control;
             pictureBoxLiner.Dock = DockStyle.Fill;
             pictureBoxLiner.Location = new Point(0, 0);
             pictureBoxLiner.Name = "pictureBoxLiner";
@@ -48,6 +49,7 @@
             // 
             // buttonCreate
             // 
+            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
             buttonCreate.Location = new Point(12, 520);
             buttonCreate.Name = "buttonCreate";
             buttonCreate.Size = new Size(150, 82);