New themeing for DockPaneCaption and DockPaneStrip.

Author: JoeRobich

PluginCore/DockPanelSuite/Customization/DockPanelStripRenderer.cs

@@ -465,7 +465,11 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
         {
             if (renderer is ToolStripProfessionalRenderer) 
             {
-                Color text = PluginBase.MainForm.GetThemeColor("ToolStripItem.TextColor");
+                Color text;
+                if (e.ToolStrip is StatusStrip)
+                    text = PluginBase.MainForm.GetThemeColor("StatusStrip.ForeColor");
+                else
+                    text = PluginBase.MainForm.GetThemeColor("ToolStripItem.TextColor");
                 if (text != Color.Empty) e.TextColor = text;
             }
             renderer.DrawItemText(e);

PluginCore/DockPanelSuite/Customization/VS2005DockPaneCaption.cs

@@ -41,9 +41,9 @@ public override Bitmap Image
 
             protected override void OnRefreshChanges()
             {
-                if (DockPaneCaption.TextColor != ForeColor)
+                if (DockPaneCaption.ImageColor != ForeColor)
                 {
-                    ForeColor = DockPaneCaption.TextColor;
+                    ForeColor = DockPaneCaption.ImageColor;
                     Invalidate();
                 }
             }
@@ -348,11 +348,31 @@ private static Color InactiveTextColor
 
         private Color TextColor
         {
-            get 
+            get
             {
-                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ForeColor");
+                Color color;
+                if (DockPane.IsActivated)
+                    color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ActiveForeColor");
+                else
+                    color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ForeColor");
+
+                if (color != Color.Empty) return color;
+                else return DockPane.IsActivated ? ActiveTextColor : InactiveTextColor;
+            }
+        }
+
+        private Color ImageColor
+        {
+            get
+            {
+                Color color;
+                if (DockPane.IsActivated)
+                    color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ActiveImageColor");
+                else
+                    color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ImageColor");
+
                 if (color != Color.Empty) return color;
-                else return DockPane.IsActivated ? ActiveTextColor : InactiveTextColor; 
+                else return DockPane.IsActivated ? ActiveTextColor : InactiveTextColor;
             }
         }
 

PluginCore/DockPanelSuite/Customization/VS2005DockPaneStrip.cs

@@ -85,9 +85,9 @@ public override Bitmap Image
 
             protected override void OnRefreshChanges()
             {
-                if (VS2005DockPaneStrip.ColorDocumentActiveText != ForeColor)
+                if (VS2005DockPaneStrip.ImageColor != ForeColor)
                 {
-                    ForeColor = VS2005DockPaneStrip.ColorDocumentActiveText;
+                    ForeColor = VS2005DockPaneStrip.ImageColor;
                     Invalidate();
                 }
             }
@@ -422,7 +422,17 @@ private static int DocumentTextGapRight
             get { return ScaleHelper.Scale(_DocumentTextGapRight); }
         }
 
-        private static Pen PenToolWindowTabBorder
+        private static Pen PenToolWindowTabActiveBorder
+        {
+            get
+            {
+                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneStrip.ToolActiveBorderColor");
+                if (color != Color.Empty) return new Pen(color);
+                else return SystemPens.ControlDark;
+            }
+        }
+
+        private static Pen PenToolWindowTabInactiveBorder
         {
             get 
             {
@@ -493,7 +503,7 @@ private static Color ColorToolWindowActiveText
         {
             get 
             {
-                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneStrip.ForeColor");
+                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneStrip.ToolActiveForeColor");
                 if (color != Color.Empty) return color;
                 else return SystemColors.ControlText; 
             }
@@ -503,7 +513,7 @@ private static Color ColorDocumentActiveText
         {
             get 
             {
-                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneStrip.TabForeColor");
+                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneStrip.DocTabActiveForeColor");
                 if (color != Color.Empty) return color;
                 else return SystemColors.ControlText; 
             }
@@ -529,6 +539,16 @@ private static Color ColorDocumentInactiveText
             }
         }
 
+        private static Color ImageColor
+        {
+            get
+            {
+                Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneStrip.ImageColor");
+                if (color != Color.Empty) return color;
+                else return SystemColors.ControlText;
+            }
+        }
+
         #endregion
 
         public VS2005DockPaneStrip(DockPane pane) : base(pane)
@@ -1023,7 +1043,7 @@ private void DrawTabStrip_ToolWindow(Graphics g)
         {
             Rectangle rectTabStrip = TabStripRectangle;
 
-            g.DrawLine(PenToolWindowTabBorder, rectTabStrip.Left, rectTabStrip.Top,
+            g.DrawLine(PenToolWindowTabActiveBorder, rectTabStrip.Left, rectTabStrip.Top,
                 rectTabStrip.Right, rectTabStrip.Top);
 
             for (int i=0; i<Tabs.Count; i++)
@@ -1183,12 +1203,12 @@ private void DrawTab_ToolWindow(Graphics g, TabVS2005 tab, Rectangle rect)
             if (DockPane.ActiveContent == tab.Content)
             {
                 g.FillPath(BrushToolWindowActiveBackground, path);
-                g.DrawPath(PenToolWindowTabBorder, path);
+                g.DrawPath(PenToolWindowTabActiveBorder, path);
 
                 // NICK: eliminate line between tab and content
-                RectangleF r = path.GetBounds();
-                using (Pen pen = new Pen(Color.FromArgb(240, 239, 243)))
-                    g.DrawLine(pen, r.Left + 1, r.Top, r.Right - 1, r.Top);
+                //RectangleF r = path.GetBounds();
+                //using (Pen pen = new Pen(BackColor))
+                //   g.DrawLine(pen, r.Left + 1, r.Top, r.Right - 1, r.Top);
 
                 TextRenderer.DrawText(g, tab.Content.DockHandler.TabText, Font, rectText, ColorToolWindowActiveText, ToolWindowTextFormat);
             }