Theming improvements, new theme settings and general bug fixes...

Meychi · Meychi · commit 409f29b307a0 · 2015-10-21T00:21:31.000+03:00
diff --git a/External/Plugins/FlashDebugger/Controls/DataTreeControl.cs b/External/Plugins/FlashDebugger/Controls/DataTreeControl.cs
@@ -74,8 +74,8 @@ public DataTreeControl(bool watchMode)
             _tree.ColumnHeaderBackColor = PluginBase.MainForm.GetThemeColor("ColumnHeader.BackColor", SystemColors.Control);
             _tree.ColumnHeaderTextColor = PluginBase.MainForm.GetThemeColor("ColumnHeader.TextColor", SystemColors.ControlText);
             _tree.ColumnHeaderBorderColor = PluginBase.MainForm.GetThemeColor("ColumnHeader.BorderColor", SystemColors.ActiveBorder);
-            _tree.LineColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.LineColor", SystemColors.WindowText);
-            _tree.LineColor2 = PluginBase.MainForm.GetThemeColor("DataTreeControl.LineColor", SystemColors.WindowText);
+            _tree.LineColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.LineColor", SystemColors.ActiveBorder);
+            _tree.LineColor2 = PluginBase.MainForm.GetThemeColor("DataTreeControl.LineColor", SystemColors.ActiveBorder);
             _tree.DragDropMarkColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.ForeColor", SystemColors.WindowText);
 
             NameNodeTextBox.DrawText += NameNodeTextBox_DrawText;
@@ -167,12 +167,10 @@ void NameNodeTextBox_DrawText(object sender, DrawEventArgs e)
             Color grayText = PluginBase.MainForm.GetThemeColor("DataTreeControl.GrayText", SystemColors.GrayText);
             Color hiliteText = PluginBase.MainForm.GetThemeColor("DataTreeControl.HighlightText", SystemColors.HighlightText);
             e.TextColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.ForeColor", SystemColors.WindowText);
-            if (e.Node.IsSelected) e.TextColor = hiliteText;
+            if (e.Node.IsSelected && this.ContainsFocus) e.TextColor = hiliteText;
             try
             {
-                if (e.Node.NextNode == null && e.Node.Level == 1 && !addingNewExpression) e.Font = new Font(e.Font, FontStyle.Italic);
-                else if (e.Node.Tag is ErrorNode) e.TextColor = e.Node.IsSelected ? hiliteText : grayText;
-
+                if (e.Node.Tag is ErrorNode) e.TextColor = e.Node.IsSelected ? hiliteText : grayText;
             }
             catch (Exception) { }
         }
@@ -304,7 +302,7 @@ void ValueNodeTextBox_DrawText(object sender, DrawEventArgs e)
             Color errorText = PluginBase.MainForm.GetThemeColor("DataTreeControl.ErrorText", Color.Red);
             Color hiliteText = PluginBase.MainForm.GetThemeColor("DataTreeControl.HighlightText", SystemColors.HighlightText);
             e.TextColor = PluginBase.MainForm.GetThemeColor("DataTreeControl.ForeColor", SystemColors.WindowText);
-            if (e.Node.IsSelected) e.TextColor = hiliteText;
+            if (e.Node.IsSelected && this.ContainsFocus) e.TextColor = hiliteText;
             try
             {
                 VariableNode variableNode = e.Node.Tag as VariableNode;
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi b/External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi b/External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi b/External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/Obsidian.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/CURRENT
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi b/External/Themes/FullThemes/ThyleusTheme/$(BaseDir)/Settings/Themes/Thyleus.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Default.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/DimGray.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DefaultTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DefaultTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DimGrayTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/DimGrayTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ObsidianTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ObsidianTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ThyleusTheme.fdz b/FlashDevelop/Bin/Debug/Settings/Themes/FullThemes/ThyleusTheme.fdz
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Obsidian.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi b/FlashDevelop/Bin/Debug/Settings/Themes/Thyleus.fdi
@@ -33,9 +33,11 @@
 #CompletionList.SelectedBackColor=#ff0000
 #CompletionList.PackageColor=#ff0000
 
-#MethodCallTip.SelectedBack=#ff0000
+#MethodCallTip.SelectedFore=#ffffff
+#MethodCallTip.SelectedBack=#0000ff
 #MethodCallTip.InfoColor=#ff0000
 
+#DataGridView.LineColor=#ff0000
 #ToolStripTextBoxControl.GrayText=#808080
 #QuickFind.ErrorBack=#ff0000
 
diff --git a/PluginCore/PluginCore/Controls/Common.cs b/PluginCore/PluginCore/Controls/Common.cs
@@ -180,7 +180,7 @@ private void RefreshColors()
         {
             Color fore = PluginBase.MainForm.GetThemeColor("DataGridView.ForeColor");
             Color back = PluginBase.MainForm.GetThemeColor("DataGridView.BackColor");
-            Color border = PluginBase.MainForm.GetThemeColor("ColumnHeader.BorderColor");
+            Color border = PluginBase.MainForm.GetThemeColor("DataGridView.LineColor");
             DefaultCellStyle.ForeColor = (fore != Color.Empty) ? fore : SystemColors.WindowText;
             DefaultCellStyle.BackColor = (back != Color.Empty) ? back : SystemColors.Window;
             GridColor = (border != Color.Empty) ? border :  SystemColors.ControlDark;
diff --git a/PluginCore/PluginCore/Controls/MethodCallTip.cs b/PluginCore/PluginCore/Controls/MethodCallTip.cs
@@ -34,7 +34,13 @@ public class MethodCallTip: RichToolTip
         public MethodCallTip(IMainForm mainForm): base(mainForm)
         {
             Color color = PluginBase.MainForm.GetThemeColor("MethodCallTip.SelectedBack");
+            Color fore = PluginBase.MainForm.GetThemeColor("MethodCallTip.SelectedFore");
             if (color != Color.Empty) HLBgStyleBeg = "[BGCOLOR=" + DataConverter.ColorToHex(color).Replace("0x", "#") + "]";
+            if (fore != Color.Empty)
+            {
+                HLTextStyleBeg = "[B][COLOR=" + DataConverter.ColorToHex(fore).Replace("0x", "#") + "]";
+                HLTextStyleEnd = "[/COLOR][/B]";
+            }
         }
 
         public bool CallTipActive
diff --git a/PluginCore/PluginCore/Controls/ToolStripEx.cs b/PluginCore/PluginCore/Controls/ToolStripEx.cs
@@ -78,11 +78,15 @@ public bool ClickThrough
         /// </summary>
         protected override void WndProc(ref Message m)
         {
-            base.WndProc(ref m);
-            if (this.clickThrough && m.Msg == WM_MOUSEACTIVATE && m.Result == (IntPtr)MA_ACTIVATEANDEAT)
+            try
             {
-                m.Result = (IntPtr)MA_ACTIVATE;
+                base.WndProc(ref m);
+                if (this.clickThrough && m.Msg == WM_MOUSEACTIVATE && m.Result == (IntPtr)MA_ACTIVATEANDEAT)
+                {
+                    m.Result = (IntPtr)MA_ACTIVATE;
+                }
             }
+            catch {}
         }
 
     }
