aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.Frontend/GUI
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-07-03 19:01:59 -0400
committerMichael <[email protected]>2017-07-03 19:01:59 -0400
commit23e622ffc37fa7b2f5c21378b60912af46289575 (patch)
tree553da0c36de79b3b2ab2e8ec9c483d572cbc72a5 /ShiftOS.Frontend/GUI
parent9a9fcc1357d1c79d0e6de668a958c228d6ce5611 (diff)
downloadshiftos_thereturn-23e622ffc37fa7b2f5c21378b60912af46289575.tar.gz
shiftos_thereturn-23e622ffc37fa7b2f5c21378b60912af46289575.tar.bz2
shiftos_thereturn-23e622ffc37fa7b2f5c21378b60912af46289575.zip
image skinning of window borders
Diffstat (limited to 'ShiftOS.Frontend/GUI')
-rw-r--r--ShiftOS.Frontend/GUI/Control.cs2
-rw-r--r--ShiftOS.Frontend/GUI/TextControl.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/ShiftOS.Frontend/GUI/Control.cs b/ShiftOS.Frontend/GUI/Control.cs
index fcd5bf0..32afecc 100644
--- a/ShiftOS.Frontend/GUI/Control.cs
+++ b/ShiftOS.Frontend/GUI/Control.cs
@@ -364,7 +364,7 @@ namespace ShiftOS.Frontend.GUI
protected virtual void OnPaint(Graphics gfx)
{
-
+ gfx.Clear(Engine.SkinEngine.LoadedSkin.ControlColor);
}
public void InvalidateTopLevel()
diff --git a/ShiftOS.Frontend/GUI/TextControl.cs b/ShiftOS.Frontend/GUI/TextControl.cs
index 37b9ca7..9bf240f 100644
--- a/ShiftOS.Frontend/GUI/TextControl.cs
+++ b/ShiftOS.Frontend/GUI/TextControl.cs
@@ -89,11 +89,11 @@ namespace ShiftOS.Frontend.GUI
loc.Y = (Height - sMeasure.Height);
loc.X = (Width - sMeasure.Width);
break;
-
}
- gfx.DrawString(_text, _font, new SolidBrush(Color.White), new RectangleF(loc.X, loc.Y, sMeasure.Width, sMeasure.Height));
+ base.OnPaint(gfx);
+ gfx.DrawString(_text, _font, new SolidBrush(Engine.SkinEngine.LoadedSkin.ControlTextColor), new RectangleF(loc.X, loc.Y, sMeasure.Width, sMeasure.Height));
}
}