aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/Tools/ControlManager.cs
diff options
context:
space:
mode:
authorwowmom98 <[email protected]>2017-02-26 15:52:08 -0500
committerwowmom98 <[email protected]>2017-02-26 15:52:08 -0500
commitec61f5dfe9de92470cd91269c77713549e7d6159 (patch)
tree47faf338907cd5c57040556cff7e7a4bbd1547da /ShiftOS.WinForms/Tools/ControlManager.cs
parent2809d9c76d47640e6ac076e7484801415eff625f (diff)
parent0e3362e8e3c635150d92fd5acc9d69473ec588fc (diff)
downloadshiftos_thereturn-ec61f5dfe9de92470cd91269c77713549e7d6159.tar.gz
shiftos_thereturn-ec61f5dfe9de92470cd91269c77713549e7d6159.tar.bz2
shiftos_thereturn-ec61f5dfe9de92470cd91269c77713549e7d6159.zip
Merge remote-tracking branch 'origin/master'
# Conflicts: # ShiftOS.WinForms/Resources/Shiftorium.txt
Diffstat (limited to 'ShiftOS.WinForms/Tools/ControlManager.cs')
-rw-r--r--ShiftOS.WinForms/Tools/ControlManager.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 32f0217..5cc4813 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -194,10 +194,7 @@ namespace ShiftOS.WinForms.Tools
}
}
- Image dithered = null;
-
-
- ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
+ ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
ctrl.Font = SkinEngine.LoadedSkin.MainFont;