From e35b611da3c068bfea344be9a90c79fd68fac4ff Mon Sep 17 00:00:00 2001
From: Modmuss50
Date: Sun, 4 Jun 2017 16:36:21 +0100
Subject: Add support for custom themes (#59)

---
 src/main/java/cuchaz/enigma/gui/highlight/BoxHighlightPainter.java   | 5 +++++
 .../cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java    | 4 ++--
 .../java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java | 4 +++-
 src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui/highlight')

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
 		g.setColor(this.borderColor);
 		g.drawRoundRect(bounds.x, bounds.y, bounds.width, bounds.height, 4, 4);
 	}
+
+	protected static Color getColor(int rgb, float alpha){
+		Color baseColor = new Color(rgb);
+		return new Color(baseColor.getRed(), baseColor.getGreen(), baseColor.getBlue(), (int)(255 * alpha));
+	}
 }
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 @@
 
 package cuchaz.enigma.gui.highlight;
 
-import java.awt.*;
+import cuchaz.enigma.config.Config;
 
 public class DeobfuscatedHighlightPainter extends BoxHighlightPainter {
 
 	public DeobfuscatedHighlightPainter() {
-		super(new Color(220, 255, 220), new Color(80, 160, 80));
+		super(getColor(Config.INSTANCE.deobfuscatedColor, Config.INSTANCE.deobfuscatedHiglightAlpha), getColor(Config.INSTANCE.deobfuscatedColorOutline, Config.INSTANCE.deobfuscatedOutlineAlpha));
 	}
 }
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 @@
 
 package cuchaz.enigma.gui.highlight;
 
+import cuchaz.enigma.config.Config;
+
 import java.awt.*;
 
 public class ObfuscatedHighlightPainter extends BoxHighlightPainter {
 
 	public ObfuscatedHighlightPainter() {
-		super(new Color(255, 220, 220), new Color(160, 80, 80));
+		super(getColor(Config.INSTANCE.obfuscatedColor, Config.INSTANCE.obfuscatedHiglightAlpha), getColor(Config.INSTANCE.obfuscatedColorOutline, Config.INSTANCE.obfuscatedOutlineAlpha));
 	}
 }
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 @@
 
 package cuchaz.enigma.gui.highlight;
 
-import java.awt.*;
+import cuchaz.enigma.config.Config;
 
 public class OtherHighlightPainter extends BoxHighlightPainter {
 
 	public OtherHighlightPainter() {
-		super(null, new Color(180, 180, 180));
+		super(null, getColor(Config.INSTANCE.otherColorOutline, Config.INSTANCE.otherOutlineAlpha));
 	}
 }
-- 
cgit v1.2.3