diff --git a/ContextMenuManager/BulePointLilac.Controls/MyToolBar.cs b/ContextMenuManager/BulePointLilac.Controls/MyToolBar.cs index a6f00a8..8f5398e 100644 --- a/ContextMenuManager/BulePointLilac.Controls/MyToolBar.cs +++ b/ContextMenuManager/BulePointLilac.Controls/MyToolBar.cs @@ -74,15 +74,15 @@ namespace BulePointLilac.Controls this.Image = image; this.Text = text; MyToolTip.SetToolTip(this, text); - ThroughControl(picImage); - ThroughControl(lblText); + lblText.SetEnabled(false); } readonly PictureBox picImage = new PictureBox { SizeMode = PictureBoxSizeMode.StretchImage, Size = new Size(40, 40).DpiZoom(), - BackColor = Color.Transparent + BackColor = Color.Transparent, + Enabled = false }; readonly Label lblText = new Label @@ -93,6 +93,8 @@ namespace BulePointLilac.Controls ForeColor = Color.White }; + private static Label LblText = new Label(); + public Image Image { get => picImage.Image; @@ -108,17 +110,5 @@ namespace BulePointLilac.Controls get => BackColor.A / 255; set => BackColor = Color.FromArgb((int)(value * 255), Color.White); } - - private void ThroughControl(Control ctr) - { - MouseEventArgs getAbsArgs(MouseEventArgs e) - { - return new MouseEventArgs(e.Button, e.Clicks, ctr.Left + e.X, ctr.Top + e.Y, e.Delta); - } - ctr.MouseDown += (sender, e) => this.OnMouseDown(getAbsArgs(e)); - ctr.MouseMove += (sender, e) => this.OnMouseMove(getAbsArgs(e)); - ctr.MouseEnter += (sender, e) => this.OnMouseEnter(e); - MyToolTip.SetToolTip(ctr, this.Text); - } } } \ No newline at end of file