From 64b1408b96d1ca115f705c8ec59c3bc4c1e82780 Mon Sep 17 00:00:00 2001 From: Joseph Burton Date: Thu, 16 Oct 2025 18:26:55 +0100 Subject: Color unobfuscated tokens in blue (#569) --- .../src/main/java/cuchaz/enigma/gui/config/Themes.java | 3 ++- .../src/main/java/cuchaz/enigma/gui/config/UiConfig.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'enigma-swing') diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java index d2a6608..b8a72c5 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java @@ -89,7 +89,8 @@ public class Themes { return Map.of( RenamableTokenType.OBFUSCATED, BoxHighlightPainter.create(UiConfig.getObfuscatedColor(), UiConfig.getObfuscatedOutlineColor()), RenamableTokenType.PROPOSED, BoxHighlightPainter.create(UiConfig.getProposedColor(), UiConfig.getProposedOutlineColor()), - RenamableTokenType.DEOBFUSCATED, BoxHighlightPainter.create(UiConfig.getDeobfuscatedColor(), UiConfig.getDeobfuscatedOutlineColor()) + RenamableTokenType.DEOBFUSCATED, BoxHighlightPainter.create(UiConfig.getDeobfuscatedColor(), UiConfig.getDeobfuscatedOutlineColor()), + RenamableTokenType.UNOBFUSCATED, BoxHighlightPainter.create(UiConfig.getUnobfuscatedColor(), UiConfig.getUnobfuscatedOutlineColor()) ); } diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java index ecd17f2..f0117ee 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java @@ -151,6 +151,14 @@ public final class UiConfig { return getThemeColorRgba("Deobfuscated Outline"); } + public static Color getUnobfuscatedColor() { + return getThemeColorRgba("Unobfuscated"); + } + + public static Color getUnobfuscatedOutlineColor() { + return getThemeColorRgba("Unobfuscated Outline"); + } + public static Color getEditorBackgroundColor() { return getThemeColorRgb("Editor Background"); } @@ -385,6 +393,10 @@ public final class UiConfig { s.setIfAbsentDouble("Deobfuscated Alpha", 1.0); s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50A050); s.setIfAbsentDouble("Deobfuscated Outline Alpha", 1.0); + s.setIfAbsentRgbColor("Unobfuscated", 0x7FAAFF); + s.setIfAbsentDouble("Unobfuscated Alpha", 1.0); + s.setIfAbsentRgbColor("Unobfuscated Outline", 0x183060); + s.setIfAbsentDouble("Unobfuscated Outline Alpha", 1.0); s.setIfAbsentRgbColor("Editor Background", 0xFFFFFF); s.setIfAbsentRgbColor("Highlight", 0x3333EE); s.setIfAbsentRgbColor("Caret", 0x000000); @@ -413,6 +425,10 @@ public final class UiConfig { s.setIfAbsentDouble("Deobfuscated Alpha", 0.3); s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50FA7B); s.setIfAbsentDouble("Deobfuscated Outline Alpha", 0.5); + s.setIfAbsentRgbColor("Unobfuscated", 0x3794FF); + s.setIfAbsentDouble("Unobfuscated Alpha", 0.3); + s.setIfAbsentRgbColor("Unobfuscated Outline", 0x3794FF); + s.setIfAbsentDouble("Unobfuscated Outline Alpha", 0.5); s.setIfAbsentRgbColor("Editor Background", 0x282A36); s.setIfAbsentRgbColor("Highlight", 0xFF79C6); s.setIfAbsentRgbColor("Caret", 0xF8F8F2); -- cgit v1.2.3