Theme coloring fixes...

Author: Meychi

External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs

@@ -471,8 +471,15 @@ private void SetMatch(TreeNode node)
         {
             if (lastMatch != null)
             {
-                lastMatch.BackColor = SystemColors.Window;
-                lastMatch.ForeColor = SystemColors.WindowText;
+                //lastMatch.BackColor = SystemColors.Window;
+                //lastMatch.ForeColor = SystemColors.WindowText;
+                Color back = PluginBase.MainForm.GetThemeColor("FixedTreeView.BackColor");
+                Color fore = PluginBase.MainForm.GetThemeColor("FixedTreeView.ForeColor");
+                if (back == Color.Empty) lastMatch.BackColor = System.Drawing.SystemColors.Window;
+                else lastMatch.BackColor = back;
+                if (fore == Color.Empty) lastMatch.ForeColor = System.Drawing.SystemColors.WindowText;
+                else lastMatch.ForeColor = fore;
+
             }
             lastMatch = node;
             if (lastMatch != null)

External/Plugins/ASCompletion/PluginUI.cs

@@ -495,7 +495,7 @@ private void SetHighlight(TreeNode node)
             if (currentHighlight != null)
             {
                 //currentHighlight.BackColor = System.Drawing.SystemColors.Window;
-                currentHighlight.ForeColor = System.Drawing.SystemColors.WindowText;
+                currentHighlight.ForeColor = outlineTree.ForeColor;
             }
             outlineTree.SelectedNode = currentHighlight = node;
             if (currentHighlight != null)
@@ -1093,7 +1093,9 @@ void FindProcTxtEnter(object sender, System.EventArgs e)
             if (findProcTxt.Text == searchInvitation)
             {
                 findProcTxt.Text = "";
-                findProcTxt.ForeColor = System.Drawing.SystemColors.WindowText;
+                Color fore = PluginBase.MainForm.GetThemeColor("ToolStripTextBoxControl.ForeColor");
+                if (fore == Color.Empty) findProcTxt.ForeColor = System.Drawing.SystemColors.WindowText;
+                else findProcTxt.ForeColor = fore;
             }
         }
 
@@ -1171,8 +1173,7 @@ private TreeNode FindMatch(TreeNodeCollection nodes)
         {
             foreach (TreeNode node in nodes)
             {
-                if (node.BackColor == System.Drawing.Color.LightSkyBlue)
-                    return node;
+                if (node.BackColor == SystemColors.Highlight) return node;
                 if (node.Nodes.Count > 0)
                 {
                     TreeNode subnode = FindMatch(node.Nodes);

External/Plugins/OutputPanel/PluginUI.cs

@@ -525,7 +525,9 @@ private void FindTextBoxEnter(Object sender, System.EventArgs e)
             if (this.findTextBox.Text == searchInvitation)
             {
                 this.findTextBox.Text = "";
-                this.findTextBox.ForeColor = System.Drawing.SystemColors.WindowText;
+                Color fore = PluginBase.MainForm.GetThemeColor("ToolStripTextBoxControl.ForeColor");
+                if (fore == Color.Empty) this.findTextBox.ForeColor = System.Drawing.SystemColors.WindowText;
+                else this.findTextBox.ForeColor = fore;
             }
         }
 

External/Plugins/ResultsPanel/PluginUI.cs

@@ -943,7 +943,7 @@ public void NextEntry(Object sender, System.EventArgs e)
             if (this.entriesView.Items.Count == 0) return;
             if (this.entryIndex >= 0 && this.entryIndex < this.entriesView.Items.Count)
             {
-                this.entriesView.Items[this.entryIndex].ForeColor = SystemColors.WindowText;
+                this.entriesView.Items[this.entryIndex].ForeColor = this.entriesView.ForeColor;
             }
             this.entryIndex = (this.entryIndex + 1) % this.entriesView.Items.Count;
             this.entriesView.SelectedItems.Clear();
@@ -961,7 +961,7 @@ public void PreviousEntry(Object sender, System.EventArgs e)
             if (this.entriesView.Items.Count == 0) return;
             if (this.entryIndex >= 0 && this.entryIndex < this.entriesView.Items.Count)
             {
-                this.entriesView.Items[this.entryIndex].ForeColor = SystemColors.WindowText;
+                this.entriesView.Items[this.entryIndex].ForeColor = this.entriesView.ForeColor;
             }
             if (--this.entryIndex < 0) this.entryIndex = this.entriesView.Items.Count - 1;
             this.entriesView.SelectedItems.Clear();