Changed ButtonEventHandler to EventHandler
Made lock disable the selection widget but be more inteligent about re-enabling it after unlock
This commit is contained in:
parent
e3ba5f3ea7
commit
222a5a46a7
49 changed files with 343 additions and 263 deletions
|
|
@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl
|
|||
valueDisplay.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
valueDisplay.Margin = new BorderDouble(6);
|
||||
|
||||
clickableValueContainer.Click += new ClickWidget.ButtonEventHandler(editField_Click);
|
||||
clickableValueContainer.Click += new EventHandler(editField_Click);
|
||||
|
||||
clickableValueContainer.AddChild(valueDisplay);
|
||||
clickableValueContainer.SetBoundsToEncloseChildren();
|
||||
|
|
@ -82,14 +82,14 @@ namespace MatterHackers.MatterControl
|
|||
}
|
||||
};
|
||||
|
||||
setButton.Click += new ButtonBase.ButtonEventHandler(setButton_Click);
|
||||
setButton.Click += new EventHandler(setButton_Click);
|
||||
|
||||
this.AddChild(clickableValueContainer);
|
||||
this.AddChild(numberInputField);
|
||||
this.AddChild(setButton);
|
||||
}
|
||||
|
||||
void editField_Click(object sender, MouseEventArgs mouseEvent)
|
||||
void editField_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
clickableValueContainer.Visible = false;
|
||||
numberInputField.Visible = true;
|
||||
|
|
@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl
|
|||
}
|
||||
}
|
||||
|
||||
void setButton_Click(object sender, MouseEventArgs mouseEvent)
|
||||
void setButton_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
OnEditComplete();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue