Pyro/PIbd-14_Ivleev_D.A._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Pyro 2024-02-23 12:12:17 +04:00
parent 867060b716
commit e1e1990698
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ProjectMotorBoat/ProjectMotorBoat/DrawingMotorBoat.cs
View File

@ -74,26 +74,24 @@ public class DrawingMotorBoat
{
// TODO проверка, что объект "влезает" в размеры поля
// если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена ✔
if (_drawningBoatWidth < width)
if (_drawningBoatWidth < width && _drawningBoatHeight < height)
{
_pictureWidth = width;
if (_startPosX + _drawningBoatWidth > _pictureWidth)
_pictureHeight = height;
if (_startPosX != null && _startPosX + _drawningBoatWidth > _pictureWidth)
{
_startPosX = _pictureWidth - _drawningBoatWidth;
}
}
if (_drawningBoatHeight < height)
{
_pictureHeight = height;
if (_startPosY + _drawningBoatHeight > _pictureHeight)
if (_startPosY != null && _startPosY + _drawningBoatHeight > _pictureHeight)
{
_startPosY = _pictureHeight - _drawningBoatHeight;
}
}
return true;
}
return false;
}
/// <summary>
/// Установка позиции
@ -118,6 +116,9 @@ public class DrawingMotorBoat
y = (int)_pictureHeight - _drawningBoatHeight;
}
if (x < 0) x = 0;
if (y < 0) y = 0;
_startPosX = x;
_startPosY = y;
}