Revert "Настройка работы цветов на панели."
This reverts commit b20b3ea0cb390a157ff355f2a58a864744cd71aa.
This commit is contained in:
parent
b20b3ea0cb
commit
23bc46fd64
@ -52,8 +52,6 @@ namespace Airbus
|
||||
EventAddPlane += ev;
|
||||
}
|
||||
}
|
||||
|
||||
//передаем информацию при нажатии на Label
|
||||
private void LabelObject_MouseDown(object sender, MouseEventArgs e)
|
||||
{
|
||||
(sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
|
||||
@ -78,10 +76,10 @@ namespace Airbus
|
||||
switch (e.Data.GetData(DataFormats.Text).ToString())
|
||||
{
|
||||
case "labelSimpleObject":
|
||||
_plane = new DrawningAirbus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor);
|
||||
_plane = new DrawningAirbus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
|
||||
break;
|
||||
case "labelModifiedObject":
|
||||
_plane = new DrawningSuperAirbus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelBaseColor.BackColor, labelAddColor.BackColor,
|
||||
_plane = new DrawningSuperAirbus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black,
|
||||
checkBoxAddСompartment.Checked, checkBoxAddEngine.Checked);
|
||||
break;
|
||||
}
|
||||
@ -98,7 +96,7 @@ namespace Airbus
|
||||
//проверка получаемой информации (её типа на соответсвие требуемому)
|
||||
private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
|
||||
{
|
||||
if (e.Data.GetDataPresent(DataFormats.Text))
|
||||
if (e.Data.GetDataPresent(typeof(Color)))
|
||||
{
|
||||
e.Effect = DragDropEffects.Copy;
|
||||
}
|
||||
@ -111,82 +109,13 @@ namespace Airbus
|
||||
//принимаем основной цвет
|
||||
private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
|
||||
{
|
||||
switch (e.Data.GetData(DataFormats.Text).ToString())
|
||||
{
|
||||
case "panelRed":
|
||||
labelBaseColor.BackColor = Color.Red;
|
||||
break;
|
||||
case "panelBlack":
|
||||
labelBaseColor.BackColor = Color.Black;
|
||||
break;
|
||||
case "panelGreen":
|
||||
labelBaseColor.BackColor = Color.Green;
|
||||
break;
|
||||
case "panelBlue":
|
||||
labelBaseColor.BackColor = Color.Blue;
|
||||
break;
|
||||
case "panelYellow":
|
||||
labelBaseColor.BackColor = Color.Yellow;
|
||||
break;
|
||||
case "panelPurple":
|
||||
labelBaseColor.BackColor = Color.Purple;
|
||||
break;
|
||||
case "panelWhite":
|
||||
labelBaseColor.BackColor = Color.White;
|
||||
break;
|
||||
case "panelGray":
|
||||
labelBaseColor.BackColor = Color.DarkGray;
|
||||
break;
|
||||
}
|
||||
|
||||
DrawPlane();
|
||||
}
|
||||
|
||||
//проверка получаемой информации (её типа на соответсвие требуемому)
|
||||
private void LabelAddColor_DragEnter(object sender, DragEventArgs e)
|
||||
{
|
||||
if (e.Data.GetDataPresent(DataFormats.Text))
|
||||
{
|
||||
e.Effect = DragDropEffects.Copy;
|
||||
}
|
||||
else
|
||||
{
|
||||
e.Effect = DragDropEffects.None;
|
||||
}
|
||||
//TODO Call method from object _plane and set Color
|
||||
}
|
||||
|
||||
//принимаем дополнительный цвет
|
||||
private void LabelAddColor_DragDrop(object sender, DragEventArgs e)
|
||||
private void labelAddColor_DragDrop(object sender, DragEventArgs e)
|
||||
{
|
||||
switch (e.Data.GetData(DataFormats.Text).ToString())
|
||||
{
|
||||
case "panelRed":
|
||||
labelAddColor.BackColor = Color.Red;
|
||||
break;
|
||||
case "panelBlack":
|
||||
labelAddColor.BackColor = Color.Black;
|
||||
break;
|
||||
case "panelGreen":
|
||||
labelAddColor.BackColor = Color.Green;
|
||||
break;
|
||||
case "panelBlue":
|
||||
labelAddColor.BackColor = Color.Blue;
|
||||
break;
|
||||
case "panelYellow":
|
||||
labelAddColor.BackColor = Color.Yellow;
|
||||
break;
|
||||
case "panelPurple":
|
||||
labelAddColor.BackColor = Color.Purple;
|
||||
break;
|
||||
case "panelWhite":
|
||||
labelAddColor.BackColor = Color.White;
|
||||
break;
|
||||
case "panelGray":
|
||||
labelAddColor.BackColor = Color.DarkGray;
|
||||
break;
|
||||
}
|
||||
|
||||
DrawPlane();
|
||||
//TODO Call method from object _plane is DrawningSuperAirbus and set add color
|
||||
}
|
||||
|
||||
//добавление самолета
|
||||
|
Loading…
x
Reference in New Issue
Block a user