ekallin/PIbd-21_Bakalskaya_E.D._ElectricLocomotive._BASE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Bakalskaya E.D. LabWork05 BASE #7

Closed
ekallin wants to merge 6 commits from LabWork05 into LabWork04
pull from: LabWork05
merge into: ekallin:LabWork04
Conversation 1 Commits 6 Files Changed 10 +2 -10
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e0834fb83 - Show all commits

11
ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs
View File

@ -29,7 +29,7 @@ namespace ProjectElectricLocomotive
{
InitializeComponent();
//panelPastelRed.MouseDown += PanelColor_MouseDown;
panelPastelRed.MouseDown += PanelColor_MouseDown;
panelPastelPink.MouseDown += PanelColor_MouseDown;
panelPastelOrange.MouseDown += PanelColor_MouseDown;
panelPastelYellow.MouseDown += PanelColor_MouseDown;
@ -38,12 +38,6 @@ namespace ProjectElectricLocomotive
panelPastelLilac.MouseDown += PanelColor_MouseDown;
panelPastelViolet.MouseDown += PanelColor_MouseDown;
/*ButtonOk.Click += delegate
{
EventAddLoco?.Invoke(_loco);
Close();
};*/
buttonCancel.Click += (sender, e) => Close();
}
@ -138,8 +132,7 @@ namespace ProjectElectricLocomotive
}
// НЕ УВЕРЕНА, ЧТО ВЕРНО
// НЕ УВЕРЕНА, ЧТО ВЕРНО, драгдроп для цветов
private void PanelColor_MouseDown(object sender, MouseEventArgs e)
{
(sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor,

1
ProjectElectricLocomotive/ProjectElectricLocomotive/LocomotiveGenericStorage.cs
View File

@ -71,7 +71,6 @@ namespace ProjectElectricLocomotive.Generics
{
get
{
// TODO Продумать логику получения набора
if (_locomotivesStorage.ContainsKey(ind))
{
return _locomotivesStorage[ind];