fix conflicts

2024-05-15 11:59:39 +04:00 · 2024-05-15 11:59:39 +04:00 · f051a9bfec
commit f051a9bfec
parent 484c309603 0b57c930c7
2 changed files with 5 additions and 5 deletions
--- a/ProjectAirbus/ProjectAirbus/Drawnings/DrawningBus.cs
+++ b/ProjectAirbus/ProjectAirbus/Drawnings/DrawningBus.cs
@ -44,11 +44,11 @@ public class DrawningBus
        EntityBus = new EntityBus(speed, weight, bodyColor);
    } 

-    //конструктор для наследников
+    
    protected DrawningBus(int drawningBusWidth, int drawningBusHeigh) : this()
    {
-        drawningBusWidth = drawningBusWidth; //ширина
-        drawningBusHeigh = drawningBusHeigh;  //высота 
+        drawningBusWidth = drawningBusWidth; 
+        drawningBusHeigh = drawningBusHeigh;  
        
    }

@ -119,7 +119,7 @@ public class DrawningBus
                {
                    _startPosX += (int)EntityBus.Step;
                }
-                //TODO прописать логику сдвига в право
+                
                return true;
            //вниз
            case DirectionType.Down:
--- a/ProjectAirbus/ProjectAirbus/FormBusConfig.Designer.cs
+++ b/ProjectAirbus/ProjectAirbus/FormBusConfig.Designer.cs
@ -266,7 +266,7 @@
            buttonCancel.Size = new Size(94, 29);
            buttonCancel.TabIndex = 3;
            buttonCancel.Text = "Отмена ";
-            buttonCancel.UseVisualStyleBackColor = true;
+
            // 
            // panelObject
            //