Use JBColor to ensure colours are correct with new UI (#608)

jshiell · Apr 1, 2023 · 6a0f0f7 · 6a0f0f7
1 parent d5bd63f
commit 6a0f0f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 
 # CheckStyle-IDEA Changelog
 
+* **5.77.1** Fixed: Colour mismatch in new UI (#608).
 * **5.77.1** Fixed: Improved action update handling to reduce pauses (#601).
 * **5.77.0** Fixed: Remove constructor injection from CheckerFactory for 2023.x compatibility (#604).
 * **5.77.0** New: Now built against IDEA 2022.1.4 (was 2021.3.3).

diff --git a/src/main/java/org/infernus/idea/checkstyle/toolwindow/ResultTreeRenderer.java b/src/main/java/org/infernus/idea/checkstyle/toolwindow/ResultTreeRenderer.java
@@ -1,5 +1,7 @@
 package org.infernus.idea.checkstyle.toolwindow;
 
+import com.intellij.ui.JBColor;
+
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeCellRenderer;
@@ -33,7 +35,7 @@ public void paintComponent(final Graphics g) {
         g.fillRect(offset, 0, getWidth() - 1 - offset, getHeight() - 1);
 
         if (selected) {
-            g.setColor(UIManager.getColor("Tree.selectionBorderColor"));
+            g.setColor(JBColor.getColor("Tree.selectionBorderColor"));
             g.drawRect(offset, 0, getWidth() - 1 - offset, getHeight() - 1);
         }
 
@@ -73,10 +75,8 @@ public Component getTreeCellRendererComponent(final JTree tree,
 
         setFont(tree.getFont());
 
-        setForeground(UIManager.getColor(selected
-                ? "Tree.selectionForeground" : "Tree.textForeground"));
-        setBackground(UIManager.getColor(selected
-                ? "Tree.selectionBackground" : "Tree.textBackground"));
+        setForeground(JBColor.getColor(selected ? "Tree.selectionForeground" : "Tree.textForeground"));
+        setBackground(JBColor.getColor(selected ? "Tree.selectionBackground" : "Tree.textBackground"));
 
 
         return this;

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -24,6 +24,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.77.1: Fixed: Colour mismatch in new UI (#608).</li>
     <li>5.77.1: Fixed: Improved action update handling to reduce pauses (#601).</li>
     <li>5.77.0: Fixed: Remove constructor injection from CheckerFactory for 2023.x compatibility (#604).</li>
     <li>5.77.0: New: Now built against IDEA 2022.1.4 (was 2021.3.3).</li>