diff options
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/highlight')
4 files changed, 12 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java index 0f64927..976c215 100644 --- a/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java +++ b/src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java | |||
| @@ -58,4 +58,9 @@ public abstract class BoxHighlightPainter implements Highlighter.HighlightPainte | |||
| 58 | g.setColor(this.borderColor); | 58 | g.setColor(this.borderColor); |
| 59 | g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4); | 59 | g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4); |
| 60 | } | 60 | } |
| 61 | |||
| 62 | protected static Color getColor(int rgb, float alpha){ | ||
| 63 | Color baseColor = new Color(rgb); | ||
| 64 | return new Color(baseColor.getRed(), baseColor.getGreen(), baseColor.getBlue(), (int)(255 * alpha)); | ||
| 65 | } | ||
| 61 | } | 66 | } |
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java index a2d2884..ef651e3 100644 --- a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java +++ b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java | |||
| @@ -11,11 +11,11 @@ | |||
| 11 | 11 | ||
| 12 | package cuchaz.enigma.gui.highlight; | 12 | package cuchaz.enigma.gui.highlight; |
| 13 | 13 | ||
| 14 | import java.awt.*; | 14 | import cuchaz.enigma.config.Config; |
| 15 | 15 | ||
| 16 | public class DeobfuscatedHighlightPainter extends BoxHighlightPainter { | 16 | public class DeobfuscatedHighlightPainter extends BoxHighlightPainter { |
| 17 | 17 | ||
| 18 | public DeobfuscatedHighlightPainter() { | 18 | public DeobfuscatedHighlightPainter() { |
| 19 | super(new Color(220, 255, 220), new Color(80, 160, 80)); | 19 | super(getColor(Config.INSTANCE.deobfuscatedColor, Config.INSTANCE.deobfuscatedHiglightAlpha), getColor(Config.INSTANCE.deobfuscatedColorOutline, Config.INSTANCE.deobfuscatedOutlineAlpha)); |
| 20 | } | 20 | } |
| 21 | } | 21 | } |
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java index 0947d4b..7887906 100644 --- a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java +++ b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java | |||
| @@ -11,11 +11,13 @@ | |||
| 11 | 11 | ||
| 12 | package cuchaz.enigma.gui.highlight; | 12 | package cuchaz.enigma.gui.highlight; |
| 13 | 13 | ||
| 14 | import cuchaz.enigma.config.Config; | ||
| 15 | |||
| 14 | import java.awt.*; | 16 | import java.awt.*; |
| 15 | 17 | ||
| 16 | public class ObfuscatedHighlightPainter extends BoxHighlightPainter { | 18 | public class ObfuscatedHighlightPainter extends BoxHighlightPainter { |
| 17 | 19 | ||
| 18 | public ObfuscatedHighlightPainter() { | 20 | public ObfuscatedHighlightPainter() { |
| 19 | super(new Color(255, 220, 220), new Color(160, 80, 80)); | 21 | super(getColor(Config.INSTANCE.obfuscatedColor, Config.INSTANCE.obfuscatedHiglightAlpha), getColor(Config.INSTANCE.obfuscatedColorOutline, Config.INSTANCE.obfuscatedOutlineAlpha)); |
| 20 | } | 22 | } |
| 21 | } | 23 | } |
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java index 74e7273..c5154e1 100644 --- a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java +++ b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java | |||
| @@ -11,11 +11,11 @@ | |||
| 11 | 11 | ||
| 12 | package cuchaz.enigma.gui.highlight; | 12 | package cuchaz.enigma.gui.highlight; |
| 13 | 13 | ||
| 14 | import java.awt.*; | 14 | import cuchaz.enigma.config.Config; |
| 15 | 15 | ||
| 16 | public class OtherHighlightPainter extends BoxHighlightPainter { | 16 | public class OtherHighlightPainter extends BoxHighlightPainter { |
| 17 | 17 | ||
| 18 | public OtherHighlightPainter() { | 18 | public OtherHighlightPainter() { |
| 19 | super(null, new Color(180, 180, 180)); | 19 | super(null, getColor(Config.INSTANCE.otherColorOutline, Config.INSTANCE.otherOutlineAlpha)); |
| 20 | } | 20 | } |
| 21 | } | 21 | } |