VAR/VAR.Toolbox
1
0
Fork 0
Code Issues 11 Pull Requests Packages Projects Releases Wiki Activity

Redraw full control rectangle on custom controls:

Browse Source 
This fixes graphics issues with custom controls; CButton CComboBox and CGroupBox.
This commit is contained in:
Valeriano A.R.
2021-12-01 07:15:47 +01:00
parent a3e4ca9ea1
commit 7ceabb226b
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
VAR.Toolbox/Controls/CButton.cs
View File

@@ -75,30 +75,31 @@ namespace VAR.Toolbox.Controls
protected override void OnPaint(PaintEventArgs pevent) protected override void OnPaint(PaintEventArgs pevent)
{ {
Rectangle rectangle = new Rectangle(0, 0, Width, Height);
if (Enabled) if (Enabled)
{ {
if (_mouseIsDown) if (_mouseIsDown)
{ {
pevent.Graphics.FillRectangle(_backColorDownBrush, pevent.ClipRectangle); pevent.Graphics.FillRectangle(_backColorDownBrush, rectangle);
} }
else else
{ {
if (_mouseIsOver) if (_mouseIsOver)
{ {
pevent.Graphics.FillRectangle(_backColorOverBrush, pevent.ClipRectangle); pevent.Graphics.FillRectangle(_backColorOverBrush, rectangle);
} }
else else
{ {
pevent.Graphics.FillRectangle(_backColorBrush, pevent.ClipRectangle); pevent.Graphics.FillRectangle(_backColorBrush, rectangle);
} }
} }
} }
else 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);
} }
} }

3
VAR.Toolbox/Controls/CComboBox.cs
View File

@@ -15,7 +15,8 @@ namespace VAR.Toolbox.Controls
protected override void OnPaint(PaintEventArgs pevent) 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);
} }
} }
} }

6
VAR.Toolbox/Controls/CGroupBox.cs
View File

@@ -37,12 +37,12 @@ namespace VAR.Toolbox.Controls
Size tSize = TextRenderer.MeasureText(Text, Font); 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.Y = (borderRect.Y + (tSize.Height / 2));
borderRect.Height = (borderRect.Height - (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.X = (textRect.X + 6);
textRect.Width = tSize.Width; textRect.Width = tSize.Width;
textRect.Height = tSize.Height; textRect.Height = tSize.Height;