diff --git a/VAR.Toolbox/Controls/CButton.cs b/VAR.Toolbox/Controls/CButton.cs index b57e936..62b133c 100644 --- a/VAR.Toolbox/Controls/CButton.cs +++ b/VAR.Toolbox/Controls/CButton.cs @@ -75,30 +75,31 @@ namespace VAR.Toolbox.Controls protected override void OnPaint(PaintEventArgs pevent) { + Rectangle rectangle = new Rectangle(0, 0, Width, Height); if (Enabled) { if (_mouseIsDown) { - pevent.Graphics.FillRectangle(_backColorDownBrush, pevent.ClipRectangle); + pevent.Graphics.FillRectangle(_backColorDownBrush, rectangle); } else { if (_mouseIsOver) { - pevent.Graphics.FillRectangle(_backColorOverBrush, pevent.ClipRectangle); + pevent.Graphics.FillRectangle(_backColorOverBrush, rectangle); } else { - pevent.Graphics.FillRectangle(_backColorBrush, pevent.ClipRectangle); + pevent.Graphics.FillRectangle(_backColorBrush, rectangle); } } } else { - pevent.Graphics.FillRectangle(_backColorBrush, pevent.ClipRectangle); + pevent.Graphics.FillRectangle(_backColorBrush, rectangle); } - pevent.Graphics.DrawString(Text, Font, Enabled ? _foreColorBrush : _foreColorDisableBrush, pevent.ClipRectangle, _stringFormat); + pevent.Graphics.DrawString(Text, Font, Enabled ? _foreColorBrush : _foreColorDisableBrush, rectangle, _stringFormat); } } diff --git a/VAR.Toolbox/Controls/CComboBox.cs b/VAR.Toolbox/Controls/CComboBox.cs index 498348a..69a6e2e 100644 --- a/VAR.Toolbox/Controls/CComboBox.cs +++ b/VAR.Toolbox/Controls/CComboBox.cs @@ -15,7 +15,8 @@ namespace VAR.Toolbox.Controls protected override void OnPaint(PaintEventArgs pevent) { - pevent.Graphics.FillRectangle(Brushes.CadetBlue, pevent.ClipRectangle); + Rectangle rectangle = new Rectangle(0, 0, Width, Height); + pevent.Graphics.FillRectangle(Brushes.CadetBlue, rectangle); } } } diff --git a/VAR.Toolbox/Controls/CGroupBox.cs b/VAR.Toolbox/Controls/CGroupBox.cs index 1e87f5a..ceafd90 100644 --- a/VAR.Toolbox/Controls/CGroupBox.cs +++ b/VAR.Toolbox/Controls/CGroupBox.cs @@ -37,12 +37,12 @@ namespace VAR.Toolbox.Controls Size tSize = TextRenderer.MeasureText(Text, Font); - Rectangle borderRect = e.ClipRectangle; + Rectangle borderRect = new Rectangle(0, 0, Width, Height); borderRect.Y = (borderRect.Y + (tSize.Height / 2)); borderRect.Height = (borderRect.Height - (tSize.Height / 2)); - ControlPaint.DrawBorder(e.Graphics, borderRect, this._borderColor, ButtonBorderStyle.Solid); + ControlPaint.DrawBorder(e.Graphics, borderRect, _borderColor, ButtonBorderStyle.Solid); - Rectangle textRect = e.ClipRectangle; + Rectangle textRect = new Rectangle(0, 0, Width, Height); textRect.X = (textRect.X + 6); textRect.Width = tSize.Width; textRect.Height = tSize.Height;