diff --git a/AircraftCarrier/AircraftCarrier/AircraftsGenericCollection.cs b/AircraftCarrier/AircraftCarrier/AircraftsGenericCollection.cs index d2ca4b9..4a8a8bf 100644 --- a/AircraftCarrier/AircraftCarrier/AircraftsGenericCollection.cs +++ b/AircraftCarrier/AircraftCarrier/AircraftsGenericCollection.cs @@ -95,7 +95,7 @@ namespace AircraftCarrier.Generics if (aircraft != null) { - aircraft.SetPosition(i % Width * _placeSizeWidth + 3, 600); + aircraft.SetPosition(i % Width * _placeSizeWidth + 3, (Height - i / Width - 1) * _placeSizeHeight +5); aircraft.DrawTransport(g); } i++; diff --git a/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.Designer.cs b/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.Designer.cs index 933f90b..d1da1d4 100644 --- a/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.Designer.cs +++ b/AircraftCarrier/AircraftCarrier/FormAircraftCarrier.Designer.cs @@ -46,7 +46,7 @@ pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 0); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(882, 453); + pictureBox.Size = new Size(1033, 724); pictureBox.SizeMode = PictureBoxSizeMode.AutoSize; pictureBox.TabIndex = 0; pictureBox.TabStop = false; @@ -57,7 +57,7 @@ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonUp.BackgroundImage = Properties.Resources.Icon_Up; buttonUp.BackgroundImageLayout = ImageLayout.Zoom; - buttonUp.Location = new Point(791, 366); + buttonUp.Location = new Point(942, 637); buttonUp.Name = "buttonUp"; buttonUp.Size = new Size(30, 30); buttonUp.TabIndex = 2; @@ -69,7 +69,7 @@ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonLeft.BackgroundImage = Properties.Resources.Icon_Left; buttonLeft.BackgroundImageLayout = ImageLayout.Zoom; - buttonLeft.Location = new Point(755, 402); + buttonLeft.Location = new Point(906, 673); buttonLeft.Name = "buttonLeft"; buttonLeft.Size = new Size(30, 30); buttonLeft.TabIndex = 3; @@ -81,7 +81,7 @@ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonDown.BackgroundImage = Properties.Resources.Icon_Down; buttonDown.BackgroundImageLayout = ImageLayout.Zoom; - buttonDown.Location = new Point(791, 402); + buttonDown.Location = new Point(942, 673); buttonDown.Name = "buttonDown"; buttonDown.Size = new Size(30, 30); buttonDown.TabIndex = 4; @@ -93,7 +93,7 @@ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonRight.BackgroundImage = Properties.Resources.Icon_Right; buttonRight.BackgroundImageLayout = ImageLayout.Zoom; - buttonRight.Location = new Point(827, 402); + buttonRight.Location = new Point(978, 673); buttonRight.Name = "buttonRight"; buttonRight.Size = new Size(30, 30); buttonRight.TabIndex = 5; @@ -103,7 +103,7 @@ // ButtonCreateAircraftCarrier // ButtonCreateAircraftCarrier.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - ButtonCreateAircraftCarrier.Location = new Point(234, 393); + ButtonCreateAircraftCarrier.Location = new Point(234, 664); ButtonCreateAircraftCarrier.Name = "ButtonCreateAircraftCarrier"; ButtonCreateAircraftCarrier.Size = new Size(204, 39); ButtonCreateAircraftCarrier.TabIndex = 6; @@ -114,7 +114,7 @@ // ButtonCreateAircraft // ButtonCreateAircraft.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - ButtonCreateAircraft.Location = new Point(12, 393); + ButtonCreateAircraft.Location = new Point(12, 664); ButtonCreateAircraft.Name = "ButtonCreateAircraft"; ButtonCreateAircraft.Size = new Size(204, 39); ButtonCreateAircraft.TabIndex = 7; @@ -128,7 +128,7 @@ comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxStrategy.FormattingEnabled = true; comboBoxStrategy.Items.AddRange(new object[] { "MoveToCenter", "MoveToBorder" }); - comboBoxStrategy.Location = new Point(706, 12); + comboBoxStrategy.Location = new Point(857, 12); comboBoxStrategy.Name = "comboBoxStrategy"; comboBoxStrategy.Size = new Size(151, 28); comboBoxStrategy.TabIndex = 8; @@ -136,7 +136,7 @@ // buttonStep // buttonStep.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonStep.Location = new Point(763, 46); + buttonStep.Location = new Point(914, 46); buttonStep.Name = "buttonStep"; buttonStep.Size = new Size(94, 29); buttonStep.TabIndex = 9; @@ -146,7 +146,8 @@ // // buttonSelectAircraft // - buttonSelectAircraft.Location = new Point(457, 393); + buttonSelectAircraft.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonSelectAircraft.Location = new Point(456, 664); buttonSelectAircraft.Name = "buttonSelectAircraft"; buttonSelectAircraft.Size = new Size(204, 39); buttonSelectAircraft.TabIndex = 10; @@ -158,7 +159,7 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(882, 453); + ClientSize = new Size(1033, 724); Controls.Add(buttonSelectAircraft); Controls.Add(buttonStep); Controls.Add(comboBoxStrategy);