chubykina_polina/PIbd-22_Chubykina_P.P._Sailboat_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22 Chubykina P.P. LabWork_03 #3

Closed
chubykina_polina wants to merge 6 commits from LabWork_03 into LabWork_02
pull from: LabWork_03
merge into: chubykina_polina:LabWork_02
Conversation 0 Commits 6 Files Changed 9 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09e91db019 - Show all commits

2
Sailboat/Sailboat/BoatsGenericCollection.cs
View File

@ -138,7 +138,7 @@ namespace Sailboat.Generics
if (boat != null)
{
int width = _pictureWidth / _placeSizeWidth;
boat.SetPosition(i % width * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight);
boat.SetPosition(i % width * _placeSizeWidth, i / width * _placeSizeHeight);
boat.DrawTransport(g);
}
}

5
Sailboat/Sailboat/FormSailboat.cs
View File

@ -52,10 +52,9 @@ namespace Sailboat
Color dopColor = Color.FromArgb(random.Next(0, 256),
random.Next(0, 256), random.Next(0, 256));
ColorDialog dialogAddColor = new();
if (dialogAddColor.ShowDialog() == DialogResult.OK)
if (dialog.ShowDialog() == DialogResult.OK)
{
dopColor = dialogAddColor.Color;
dopColor = dialog.Color;
}
_drawingBoat = new DrawingSailboat(random.Next(100, 300),