Merge pull request #653 from JoeRobich/Add-More-Themeing

Meychi · Meychi · commit 76a2caaef537 · 2015-04-05T00:47:36.000+03:00
Add more themeing
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi
@@ -24,10 +24,18 @@ DockPanel.ShowAutoHideContentOn=Hover
 #ToolStripItem.ArrowColor=#ff0000
 #ToolStripItem.TextColor=#0000ff
 
+VS2005DockPaneCaption.ActiveForeColor=#333333
+VS2005DockPaneCaption.ActiveImageColor=#333333
+VS2005DockPaneCaption.ImageColor=#333333
 #VS2005DockPaneCaption.BorderColor=#ff0000
+
 #VS2005DockPaneStrip.DocTabActiveBorder=#ff0000
+VS2005DockPaneStrip.DocTabActiveForeColor=#000000
 #VS2005DockPaneStrip.DocTabInactiveBorder=#0000ff
+#VS2005DockPaneStrip.ToolActiveBorderColor=#ff0000
 #VS2005DockPaneStrip.ToolBorderColor=#ff0000
+VS2005DockPaneStrip.ToolActiveForeColor=#333333
+VS2005DockPaneStrip.ImageColor=#000000
 
 #ToolStripMenu.TitleBackColor=#ff00ff
 #ToolStripMenu.TitleBorderColor=#0000ff
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi
@@ -24,10 +24,18 @@ DockPanel.ShowAutoHideContentOn=Hover
 #ToolStripItem.ArrowColor=#ff0000
 #ToolStripItem.TextColor=#0000ff
 
+VS2005DockPaneCaption.ActiveForeColor=#EEEEEE
+VS2005DockPaneCaption.ActiveImageColor=#EEEEEE
+VS2005DockPaneCaption.ImageColor=#EEEEEE
 #VS2005DockPaneCaption.BorderColor=#ff0000
+
 #VS2005DockPaneStrip.DocTabActiveBorder=#ff0000
+VS2005DockPaneStrip.DocTabActiveForeColor=#222222
 #VS2005DockPaneStrip.DocTabInactiveBorder=#0000ff
+#VS2005DockPaneStrip.ToolActiveBorderColor=#ff0000
 #VS2005DockPaneStrip.ToolBorderColor=#ff0000
+VS2005DockPaneStrip.ToolActiveForeColor=#333333
+VS2005DockPaneStrip.ImageColor=#222222
 
 #ToolStripMenu.TitleBackColor=#ff00ff
 #ToolStripMenu.TitleBorderColor=#0000ff
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi
@@ -24,10 +24,18 @@ ToolStripSeparator.ForeColor=#889299
 ToolStripItem.ArrowColor=#3C4142
 ToolStripItem.TextColor=#3C4142
 
+VS2005DockPaneCaption.ActiveForeColor=#D1D1D1
+VS2005DockPaneCaption.ActiveImageColor=#D1D1D1
+VS2005DockPaneCaption.ImageColor=#D1D1D1
+VS2005DockPaneCaption.BorderColor=#6D767C
+
 VS2005DockPaneStrip.DocTabActiveBorder=#6D767C
+VS2005DockPaneStrip.DocTabActiveForeColor=#3A4345
 VS2005DockPaneStrip.DocTabInactiveBorder=#6D767C
+VS2005DockPaneStrip.ToolActiveBorderColor=#6D767C
 VS2005DockPaneStrip.ToolBorderColor=#6D767C
-VS2005DockPaneCaption.BorderColor=#6D767C
+VS2005DockPaneStrip.ToolActiveForeColor=#3A4345
+VS2005DockPaneStrip.ImageColor=#3A4345
 
 ToolStripMenu.TitleBackColor=#D2D5D3
 ToolStripMenu.TitleBorderColor=#75828A
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi
@@ -24,10 +24,18 @@ ToolStripSeparator.ForeColor=#9D9895
 ToolStripItem.ArrowColor=#474443
 ToolStripItem.TextColor=#363330
 
+VS2005DockPaneCaption.ActiveForeColor=#D1D1D1
+VS2005DockPaneCaption.ActiveImageColor=#D1D1D1
+VS2005DockPaneCaption.ImageColor=#D1D1D1
+VS2005DockPaneCaption.BorderColor=#696463
+
 VS2005DockPaneStrip.DocTabActiveBorder=#696463
+VS2005DockPaneStrip.DocTabActiveForeColor=#222222
 VS2005DockPaneStrip.DocTabInactiveBorder=#696463
+VS2005DockPaneStrip.ToolActiveBorderColor=#696463
 VS2005DockPaneStrip.ToolBorderColor=#696463
-VS2005DockPaneCaption.BorderColor=#696463
+VS2005DockPaneStrip.ToolActiveForeColor=#222222
+VS2005DockPaneStrip.ImageColor=#222222
 
 ToolStripMenu.TitleBackColor=#CBC8C5
 ToolStripMenu.TitleBorderColor=#696463
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi
@@ -24,10 +24,18 @@ DockPanel.ShowAutoHideContentOn=Hover
 #ToolStripItem.ArrowColor=#ff0000
 #ToolStripItem.TextColor=#0000ff
 
+VS2005DockPaneCaption.ActiveForeColor=#333333
+VS2005DockPaneCaption.ActiveImageColor=#333333
+VS2005DockPaneCaption.ImageColor=#333333
 #VS2005DockPaneCaption.BorderColor=#ff0000
+
 #VS2005DockPaneStrip.DocTabActiveBorder=#ff0000
+VS2005DockPaneStrip.DocTabActiveForeColor=#000000
 #VS2005DockPaneStrip.DocTabInactiveBorder=#0000ff
+#VS2005DockPaneStrip.ToolActiveBorderColor=#ff0000
 #VS2005DockPaneStrip.ToolBorderColor=#ff0000
+VS2005DockPaneStrip.ToolActiveForeColor=#333333
+VS2005DockPaneStrip.ImageColor=#000000
 
 #ToolStripMenu.TitleBackColor=#ff00ff
 #ToolStripMenu.TitleBorderColor=#0000ff
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi
@@ -24,10 +24,18 @@ DockPanel.ShowAutoHideContentOn=Hover
 #ToolStripItem.ArrowColor=#ff0000
 #ToolStripItem.TextColor=#0000ff
 
+VS2005DockPaneCaption.ActiveForeColor=#EEEEEE
+VS2005DockPaneCaption.ActiveImageColor=#EEEEEE
+VS2005DockPaneCaption.ImageColor=#EEEEEE
 #VS2005DockPaneCaption.BorderColor=#ff0000
+
 #VS2005DockPaneStrip.DocTabActiveBorder=#ff0000
+VS2005DockPaneStrip.DocTabActiveForeColor=#222222
 #VS2005DockPaneStrip.DocTabInactiveBorder=#0000ff
+#VS2005DockPaneStrip.ToolActiveBorderColor=#ff0000
 #VS2005DockPaneStrip.ToolBorderColor=#ff0000
+VS2005DockPaneStrip.ToolActiveForeColor=#333333
+VS2005DockPaneStrip.ImageColor=#222222
 
 #ToolStripMenu.TitleBackColor=#ff00ff
 #ToolStripMenu.TitleBorderColor=#0000ff
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi
@@ -24,10 +24,18 @@ ToolStripSeparator.ForeColor=#889299
 ToolStripItem.ArrowColor=#3C4142
 ToolStripItem.TextColor=#3C4142
 
+VS2005DockPaneCaption.ActiveForeColor=#D1D1D1
+VS2005DockPaneCaption.ActiveImageColor=#D1D1D1
+VS2005DockPaneCaption.ImageColor=#D1D1D1
+VS2005DockPaneCaption.BorderColor=#6D767C
+
 VS2005DockPaneStrip.DocTabActiveBorder=#6D767C
+VS2005DockPaneStrip.DocTabActiveForeColor=#3A4345
 VS2005DockPaneStrip.DocTabInactiveBorder=#6D767C
+VS2005DockPaneStrip.ToolActiveBorderColor=#6D767C
 VS2005DockPaneStrip.ToolBorderColor=#6D767C
-VS2005DockPaneCaption.BorderColor=#6D767C
+VS2005DockPaneStrip.ToolActiveForeColor=#3A4345
+VS2005DockPaneStrip.ImageColor=#3A4345
 
 ToolStripMenu.TitleBackColor=#D2D5D3
 ToolStripMenu.TitleBorderColor=#75828A
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi
@@ -24,10 +24,18 @@ ToolStripSeparator.ForeColor=#9D9895
 ToolStripItem.ArrowColor=#474443
 ToolStripItem.TextColor=#363330
 
+VS2005DockPaneCaption.ActiveForeColor=#D1D1D1
+VS2005DockPaneCaption.ActiveImageColor=#D1D1D1
+VS2005DockPaneCaption.ImageColor=#D1D1D1
+VS2005DockPaneCaption.BorderColor=#696463
+
 VS2005DockPaneStrip.DocTabActiveBorder=#696463
+VS2005DockPaneStrip.DocTabActiveForeColor=#222222
 VS2005DockPaneStrip.DocTabInactiveBorder=#696463
+VS2005DockPaneStrip.ToolActiveBorderColor=#696463
 VS2005DockPaneStrip.ToolBorderColor=#696463
-VS2005DockPaneCaption.BorderColor=#696463
+VS2005DockPaneStrip.ToolActiveForeColor=#222222
+VS2005DockPaneStrip.ImageColor=#222222
 
 ToolStripMenu.TitleBackColor=#CBC8C5
 ToolStripMenu.TitleBorderColor=#696463
diff --git a/PluginCore/DockPanelSuite/Customization/DockPanelStripRenderer.cs b/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);
diff --git a/PluginCore/DockPanelSuite/Customization/VS2005DockPaneCaption.cs b/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;
             }
         }
 
diff --git a/PluginCore/DockPanelSuite/Customization/VS2005DockPaneStrip.cs b/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);
             }

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,11 @@ protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)`
`465`	`465`	`{`
`466`	`466`	`if (renderer is ToolStripProfessionalRenderer)`
`467`	`467`	`{`
`468`		`- Color text = PluginBase.MainForm.GetThemeColor("ToolStripItem.TextColor");`
	`468`	`+ Color text;`
	`469`	`+ if (e.ToolStrip is StatusStrip)`
	`470`	`+ text = PluginBase.MainForm.GetThemeColor("StatusStrip.ForeColor");`
	`471`	`+ else`
	`472`	`+ text = PluginBase.MainForm.GetThemeColor("ToolStripItem.TextColor");`
`469`	`473`	`if (text != Color.Empty) e.TextColor = text;`
`470`	`474`	`}`
`471`	`475`	`renderer.DrawItemText(e);`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ public override Bitmap Image`
`41`	`41`
`42`	`42`	`protected override void OnRefreshChanges()`
`43`	`43`	`{`
`44`		`- if (DockPaneCaption.TextColor != ForeColor)`
	`44`	`+ if (DockPaneCaption.ImageColor != ForeColor)`
`45`	`45`	`{`
`46`		`- ForeColor = DockPaneCaption.TextColor;`
	`46`	`+ ForeColor = DockPaneCaption.ImageColor;`
`47`	`47`	`Invalidate();`
`48`	`48`	`}`
`49`	`49`	`}`
`@@ -348,11 +348,31 @@ private static Color InactiveTextColor`
`348`	`348`
`349`	`349`	`private Color TextColor`
`350`	`350`	`{`
`351`		`- get`
	`351`	`+ get`
`352`	`352`	`{`
`353`		`- Color color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ForeColor");`
	`353`	`+ Color color;`
	`354`	`+ if (DockPane.IsActivated)`
	`355`	`+ color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ActiveForeColor");`
	`356`	`+ else`
	`357`	`+ color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ForeColor");`
	`358`	`+`
	`359`	`+ if (color != Color.Empty) return color;`
	`360`	`+ else return DockPane.IsActivated ? ActiveTextColor : InactiveTextColor;`
	`361`	`+ }`
	`362`	`+ }`
	`363`	`+`
	`364`	`+ private Color ImageColor`
	`365`	`+ {`
	`366`	`+ get`
	`367`	`+ {`
	`368`	`+ Color color;`
	`369`	`+ if (DockPane.IsActivated)`
	`370`	`+ color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ActiveImageColor");`
	`371`	`+ else`
	`372`	`+ color = PluginCore.PluginBase.MainForm.GetThemeColor("VS2005DockPaneCaption.ImageColor");`
	`373`	`+`
`354`	`374`	`if (color != Color.Empty) return color;`
`355`		`- else return DockPane.IsActivated ? ActiveTextColor : InactiveTextColor;`
	`375`	`+ else return DockPane.IsActivated ? ActiveTextColor : InactiveTextColor;`
`356`	`376`	`}`
`357`	`377`	`}`
`358`	`378`