YakovlevMaxim/PIbd-21_Yakovlev_M.G_Parusnik_Base
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправления

Browse Source
This commit is contained in:
Максим Яковлев 2023-11-12 01:44:20 +04:00
parent 20c1d01940
commit ff1ab7fbc9
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SailBoat/SailBoat/DrawningObjects/DrawningBoat.cs
View File

@ -13,9 +13,9 @@ namespace SailBoat.DrawningObjects
{ {
public EntityBoat? EntityBoat { get; protected set; } public EntityBoat? EntityBoat { get; protected set; }
private int _pictureWidth; public int _pictureWidth;
private int _pictureHeight; public int _pictureHeight;
protected int _startPosX; protected int _startPosX;

2
SailBoat/SailBoat/FormBoatCollection.cs
View File

@ -74,6 +74,8 @@ namespace SailBoat
private void AddBoat(DrawningBoat boat) private void AddBoat(DrawningBoat boat)
{ {
boat._pictureWidth = pictureBoxCollection.Width;
boat._pictureHeight = pictureBoxCollection.Height;
if (listBoxStorages.SelectedIndex == -1) return; if (listBoxStorages.SelectedIndex == -1) return;
var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty]; var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
if (obj == null) return; if (obj == null) return;

8
SailBoat/SailBoat/FormBoatConfig.Designer.cs generated
View File

@ -125,7 +125,6 @@
panelPink.Name = "panelPink"; panelPink.Name = "panelPink";
panelPink.Size = new Size(50, 50); panelPink.Size = new Size(50, 50);
panelPink.TabIndex = 1; panelPink.TabIndex = 1;
panelPink.MouseDown += PanelColor_MouseDown;
// //
// panelBlack // panelBlack
// //
@ -134,7 +133,6 @@
panelBlack.Name = "panelBlack"; panelBlack.Name = "panelBlack";
panelBlack.Size = new Size(50, 50); panelBlack.Size = new Size(50, 50);
panelBlack.TabIndex = 1; panelBlack.TabIndex = 1;
panelBlack.MouseDown += PanelColor_MouseDown;
// //
// panelGray // panelGray
// //
@ -143,7 +141,6 @@
panelGray.Name = "panelGray"; panelGray.Name = "panelGray";
panelGray.Size = new Size(50, 50); panelGray.Size = new Size(50, 50);
panelGray.TabIndex = 1; panelGray.TabIndex = 1;
panelGray.MouseDown += PanelColor_MouseDown;
// //
// panelWhite // panelWhite
// //
@ -152,7 +149,6 @@
panelWhite.Name = "panelWhite"; panelWhite.Name = "panelWhite";
panelWhite.Size = new Size(50, 50); panelWhite.Size = new Size(50, 50);
panelWhite.TabIndex = 1; panelWhite.TabIndex = 1;
panelWhite.MouseDown += PanelColor_MouseDown;
// //
// panelYellow // panelYellow
// //
@ -161,7 +157,6 @@
panelYellow.Name = "panelYellow"; panelYellow.Name = "panelYellow";
panelYellow.Size = new Size(50, 50); panelYellow.Size = new Size(50, 50);
panelYellow.TabIndex = 1; panelYellow.TabIndex = 1;
panelYellow.MouseDown += PanelColor_MouseDown;
// //
// panelBlue // panelBlue
// //
@ -170,7 +165,6 @@
panelBlue.Name = "panelBlue"; panelBlue.Name = "panelBlue";
panelBlue.Size = new Size(50, 50); panelBlue.Size = new Size(50, 50);
panelBlue.TabIndex = 1; panelBlue.TabIndex = 1;
panelBlue.MouseDown += PanelColor_MouseDown;
// //
// panelGreen // panelGreen
// //
@ -179,7 +173,6 @@
panelGreen.Name = "panelGreen"; panelGreen.Name = "panelGreen";
panelGreen.Size = new Size(50, 50); panelGreen.Size = new Size(50, 50);
panelGreen.TabIndex = 1; panelGreen.TabIndex = 1;
panelGreen.MouseDown += PanelColor_MouseDown;
// //
// panelRed // panelRed
// //
@ -188,7 +181,6 @@
panelRed.Name = "panelRed"; panelRed.Name = "panelRed";
panelRed.Size = new Size(50, 50); panelRed.Size = new Size(50, 50);
panelRed.TabIndex = 0; panelRed.TabIndex = 0;
panelRed.MouseDown += PanelColor_MouseDown;
// //
// checkBoxSail // checkBoxSail
// //

9
SailBoat/SailBoat/FormBoatConfig.cs
View File

@ -34,6 +34,14 @@ namespace SailBoat
public FormBoatConfig() public FormBoatConfig()
{ {
InitializeComponent(); InitializeComponent();
panelBlack.MouseDown += PanelColor_MouseDown;
panelPink.MouseDown += PanelColor_MouseDown;
panelGray.MouseDown += PanelColor_MouseDown;
panelGreen.MouseDown += PanelColor_MouseDown;
panelRed.MouseDown += PanelColor_MouseDown;
panelWhite.MouseDown += PanelColor_MouseDown;
panelYellow.MouseDown += PanelColor_MouseDown;
panelBlue.MouseDown += PanelColor_MouseDown;
buttonCancel.Click += (sender, e) => Close(); buttonCancel.Click += (sender, e) => Close();
} }
@ -99,6 +107,7 @@ namespace SailBoat
_boat.EntityBoat.SetBodyColor((Color)e.Data.GetData(typeof(Color))); _boat.EntityBoat.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
break; break;
case "labelAdditionalColor": case "labelAdditionalColor":
if (_boat == null) return;
(_boat.EntityBoat as EntitySailBoat).setAdditionalColor((Color)e.Data.GetData(typeof(Color))); (_boat.EntityBoat as EntitySailBoat).setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
break; break;
} }