From 7fba21da0d221ee91c207b3e7871bc4645a122f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=87=D0=B5=D0=B1=D0=BD=D1=8B=D0=B9?= Date: Mon, 13 Nov 2023 11:42:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D1=84=D0=B8=D0=BA=D1=81=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=B2=D1=81=D1=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectBoat_bae/FormBoatConfig.Designer.cs | 4 ++++ .../ProjectBoat_bae/FormBoatConfig.cs | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs index 2224947..e394431 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs @@ -108,6 +108,7 @@ labelModifiedObject.TabIndex = 11; labelModifiedObject.Text = "Продвинутый"; labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += LabelObject_MouseDown; // // labelSimpleObject // @@ -270,6 +271,8 @@ PanelObject.Name = "PanelObject"; PanelObject.Size = new Size(460, 378); PanelObject.TabIndex = 2; + PanelObject.DragDrop += PanelObject_DragDrop; + PanelObject.DragEnter += PanelObject_DragEnter; PanelObject.MouseDown += PanelColor_MouseDown; // // LabelAdditionalColor @@ -302,6 +305,7 @@ buttonOk.TabIndex = 0; buttonOk.Text = "Добавить"; buttonOk.UseVisualStyleBackColor = true; + buttonOk.Click += buttonOk_Click_1; // // buttonCancel // diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs index 0d3c86a..4d9acb6 100644 --- a/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs +++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.cs @@ -112,12 +112,12 @@ namespace ProjectBoat_bae DrawBoat(); } - // Добавление установки - private void buttonOk_Click(object sender, EventArgs e) - { - EventAddBoat?.Invoke(_boat); - Close(); - } + //// Добавление установки + //private void buttonOk_Click(object sender, EventArgs e) + //{ + // EventAddBoat?.Invoke(_boat); + // Close(); + //} // Отправляем цвет с панели private void PanelColor_MouseDown(object sender, MouseEventArgs e) @@ -186,5 +186,11 @@ namespace ProjectBoat_bae { } + + private void buttonOk_Click_1(object sender, EventArgs e) + { + EventAddBoat?.Invoke(_boat); + Close(); + } } }