From 23e622ffc37fa7b2f5c21378b60912af46289575 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Mon, 3 Jul 2017 19:01:59 -0400
Subject: image skinning of window borders

---
 ShiftOS.Frontend/GUI/Control.cs     | 2 +-
 ShiftOS.Frontend/GUI/TextControl.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ShiftOS.Frontend/GUI')

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));
         }
     }
 
-- 
cgit v1.2.3