strwbrry/PIBD-13_Matvienko_S.D._Catamaran_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fix 2

Browse Source
This commit is contained in:
strwbrry1 2024-02-21 15:23:31 +04:00
parent 29891204b0
commit 051f96a96e
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Catamaran/Catamaran/DrawingCatamaran.cs
View File

@ -39,6 +39,20 @@ namespace Catamaran
{ {
_pictureWidth = width; _pictureWidth = width;
_pictureHeight = height; _pictureHeight = height;
if (_startPosX != null && _startPosY != null)
{
if (_startPosX.Value < 0) _startPosX = 0;
if (_startPosY.Value < 0) _startPosY = 0;
if (_startPosX.Value + _drawingCatamaranWidth > _pictureWidth)
{
_startPosX = _pictureWidth - _drawingCatamaranWidth;
}
if (_startPosY.Value + _drawingCatamaranHeight > _pictureHeight)
{
_startPosY = _pictureHeight - _drawingCatamaranHeight;
}
}
return true; return true;
} }
return false; return false;
@ -67,26 +81,6 @@ namespace Catamaran
} }
public void CheckPos()
{
//if ((!_startPosX.HasValue || !_startPosY.HasValue) && (!_pictureHeight.HasValue || !_pictureWidth.HasValue))
//{
// return;
//}
if (_startPosX == null || _startPosY == null)
{
return;
}
if (_startPosX.Value + _drawingCatamaranWidth > _pictureWidth)
{
_startPosX = _pictureWidth - _drawingCatamaranWidth;
}
if (_startPosY.Value + _drawingCatamaranHeight > _pictureHeight)
{
_startPosY = _pictureHeight - _drawingCatamaranHeight;
}
}
public bool MoveTransport(DirectionType direction) public bool MoveTransport(DirectionType direction)
{ {
if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue) if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue)

1
Catamaran/Catamaran/FormCatamaran.cs
View File

@ -79,7 +79,6 @@ namespace Catamaran
if (_drawingCatamaran.SetPictureSize(pictureBox1.Width, pictureBox1.Height)) if (_drawingCatamaran.SetPictureSize(pictureBox1.Width, pictureBox1.Height))
{ {
_drawingCatamaran.CheckPos();
Draw(); Draw();
} }