Victoria_Isaeva/ISEbd-12_Isaeva_V.D._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Victoria_Isaeva 2024-05-15 11:59:39 +04:00
commit f051a9bfec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ProjectAirbus/ProjectAirbus/Drawnings/DrawningBus.cs
View File

@ -44,11 +44,11 @@ public class DrawningBus
EntityBus = new EntityBus(speed, weight, bodyColor); EntityBus = new EntityBus(speed, weight, bodyColor);
} }
//конструктор для наследников
protected DrawningBus(int drawningBusWidth, int drawningBusHeigh) : this() protected DrawningBus(int drawningBusWidth, int drawningBusHeigh) : this()
{ {
drawningBusWidth = drawningBusWidth; //ширина drawningBusWidth = drawningBusWidth;
drawningBusHeigh = drawningBusHeigh; //высота drawningBusHeigh = drawningBusHeigh;
} }
@ -119,7 +119,7 @@ public class DrawningBus
{ {
_startPosX += (int)EntityBus.Step; _startPosX += (int)EntityBus.Step;
} }
//TODO прописать логику сдвига в право
return true; return true;
//вниз //вниз
case DirectionType.Down: case DirectionType.Down:

2
ProjectAirbus/ProjectAirbus/FormBusConfig.Designer.cs generated
View File

@ -266,7 +266,7 @@
buttonCancel.Size = new Size(94, 29); buttonCancel.Size = new Size(94, 29);
buttonCancel.TabIndex = 3; buttonCancel.TabIndex = 3;
buttonCancel.Text = "Отмена "; buttonCancel.Text = "Отмена ";
buttonCancel.UseVisualStyleBackColor = true;
// //
// panelObject // panelObject
// //