Skip to content

Commit bf021ff

Browse files
extract GuiUtil.TRANSPARENT
hide SimpleSnippetPanel's caret
1 parent c835918 commit bf021ff

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/DeclarationSnippetPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.quiltmc.enigma.gui.Gui;
4141
import org.quiltmc.enigma.gui.config.Config;
4242
import org.quiltmc.enigma.gui.highlight.BoxHighlightPainter;
43+
import org.quiltmc.enigma.gui.util.GuiUtil;
4344
import org.quiltmc.enigma.util.I18n;
4445
import org.quiltmc.enigma.util.LineIndexer;
4546
import org.quiltmc.enigma.util.Result;
@@ -68,7 +69,7 @@ public DeclarationSnippetPanel(Gui gui, Entry<?> target, ClassHandle targetTopCl
6869

6970
this.getEditor().setEditable(false);
7071

71-
this.editor.setCaretColor(new Color(0, 0, 0, 0));
72+
this.editor.setCaretColor(GuiUtil.TRANSPARENT);
7273
this.editor.getCaret().setSelectionVisible(true);
7374

7475
this.addSourceSetListener(source -> {

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EntryTooltip.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.quiltmc.enigma.gui.docker.Docker;
2222
import org.quiltmc.enigma.gui.docker.ObfuscatedClassesDocker;
2323
import org.quiltmc.enigma.gui.util.GridBagConstraintsBuilder;
24+
import org.quiltmc.enigma.gui.util.GuiUtil;
2425
import org.quiltmc.enigma.gui.util.ScaleUtil;
2526
import org.quiltmc.enigma.util.I18n;
2627
import org.quiltmc.enigma.util.Utils;
@@ -36,7 +37,6 @@
3637
import javax.swing.tree.TreePath;
3738
import java.awt.AWTEvent;
3839
import java.awt.BorderLayout;
39-
import java.awt.Color;
4040
import java.awt.Component;
4141
import java.awt.Dimension;
4242
import java.awt.Font;
@@ -608,8 +608,8 @@ private static JTextArea javadocOf(String javadoc, Font font, MouseAdapter stopI
608608
text.setWrapStyleWord(true);
609609
text.setForeground(Config.getCurrentSyntaxPaneColors().comment.value());
610610
text.setFont(font);
611-
text.setBackground(invisibleColorOf());
612-
text.setCaretColor(invisibleColorOf());
611+
text.setBackground(GuiUtil.TRANSPARENT);
612+
text.setCaretColor(GuiUtil.TRANSPARENT);
613613
text.getCaret().setSelectionVisible(true);
614614
text.setBorder(createEmptyBorder());
615615

@@ -620,10 +620,6 @@ private static JTextArea javadocOf(String javadoc, Font font, MouseAdapter stopI
620620
return text;
621621
}
622622

623-
private static Color invisibleColorOf() {
624-
return new Color(0, 0, 0, 0);
625-
}
626-
627623
private ImmutableList<ParamJavadoc> paramJavadocsOf(
628624
Entry<?> target, Font nameFont, Font javadocFont, MouseAdapter stopInteraction
629625
) {

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/SimpleSnippetPanel.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.quiltmc.enigma.gui.Gui;
66
import org.quiltmc.enigma.gui.config.Config;
77
import org.quiltmc.enigma.gui.highlight.BoxHighlightPainter;
8+
import org.quiltmc.enigma.gui.util.GuiUtil;
89
import org.quiltmc.enigma.util.LineIndexer;
910

1011
import javax.swing.JEditorPane;
@@ -15,6 +16,8 @@ public class SimpleSnippetPanel extends AbstractEditorPanel<JScrollPane> {
1516
public SimpleSnippetPanel(Gui gui, @Nullable Token target) {
1617
super(gui);
1718

19+
this.editor.setCaretColor(GuiUtil.TRANSPARENT);
20+
1821
this.addSourceSetListener(source -> {
1922
this.installEditorRuler(new LineIndexer(source.toString()).getLine(this.getSourceBounds().start()));
2023

enigma-swing/src/main/java/org/quiltmc/enigma/gui/util/GuiUtil.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
import java.util.stream.IntStream;
8080

8181
public final class GuiUtil {
82+
public static final Color TRANSPARENT = new Color(0, true);
83+
8284
private GuiUtil() {
8385
throw new UnsupportedOperationException();
8486
}

0 commit comments

Comments
 (0)