From b66bd4fcba8f31bc0f7612ab000adfa7434fcb73 Mon Sep 17 00:00:00 2001 From: ekallin Date: Mon, 6 Nov 2023 14:51:00 +0400 Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C-=D1=82?= =?UTF-8?q?=D0=BE,=20=D0=BD=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=D1=8C,=20=D1=82?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=BE=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=B0=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectElectricLocomotive/DelegateLoco.cs | 2 +- .../FormLocomotiveConfig.Designer.cs | 1 + .../ProjectElectricLocomotive/FormLocomotiveConfig.cs | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs index 69a55d3..3479c87 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs @@ -11,5 +11,5 @@ namespace ProjectElectricLocomotive /// Делегат для передачи объекта-локомотив /// /// - public delegate void LocoDelegate(DrawingLocomotive loco); + public delegate void Action(DrawingLocomotive loco); } diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs index 218c423..9ef3f22 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs @@ -273,6 +273,7 @@ this.panelPastelRed.Name = "panelPastelRed"; this.panelPastelRed.Size = new System.Drawing.Size(40, 40); this.panelPastelRed.TabIndex = 0; + this.panelPastelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelObject // diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs index e2b8330..260d57d 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs @@ -21,13 +21,14 @@ namespace ProjectElectricLocomotive /// /// Событие /// - private event LocoDelegate? EventAddLoco; + + private event Action? EventAddLoco; public FormLocomotiveConfig() { InitializeComponent(); - panelPastelRed.MouseDown += PanelColor_MouseDown; + //panelPastelRed.MouseDown += PanelColor_MouseDown; panelPastelPink.MouseDown += PanelColor_MouseDown; panelPastelOrange.MouseDown += PanelColor_MouseDown; panelPastelYellow.MouseDown += PanelColor_MouseDown; @@ -43,7 +44,7 @@ namespace ProjectElectricLocomotive /// Добавление события /// /// Привязанный метод - public void AddEvent(LocoDelegate ev) + public void AddEvent(Action ev) { if (EventAddLoco == null) {