diff options
Diffstat (limited to 'enigma-swing')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/config/Themes.java | 3 | ||||
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java | 16 |
2 files changed, 18 insertions, 1 deletions
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 d2a6608c..b8a72c5e 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 { | |||
| 89 | return Map.of( | 89 | return Map.of( |
| 90 | RenamableTokenType.OBFUSCATED, BoxHighlightPainter.create(UiConfig.getObfuscatedColor(), UiConfig.getObfuscatedOutlineColor()), | 90 | RenamableTokenType.OBFUSCATED, BoxHighlightPainter.create(UiConfig.getObfuscatedColor(), UiConfig.getObfuscatedOutlineColor()), |
| 91 | RenamableTokenType.PROPOSED, BoxHighlightPainter.create(UiConfig.getProposedColor(), UiConfig.getProposedOutlineColor()), | 91 | RenamableTokenType.PROPOSED, BoxHighlightPainter.create(UiConfig.getProposedColor(), UiConfig.getProposedOutlineColor()), |
| 92 | RenamableTokenType.DEOBFUSCATED, BoxHighlightPainter.create(UiConfig.getDeobfuscatedColor(), UiConfig.getDeobfuscatedOutlineColor()) | 92 | RenamableTokenType.DEOBFUSCATED, BoxHighlightPainter.create(UiConfig.getDeobfuscatedColor(), UiConfig.getDeobfuscatedOutlineColor()), |
| 93 | RenamableTokenType.UNOBFUSCATED, BoxHighlightPainter.create(UiConfig.getUnobfuscatedColor(), UiConfig.getUnobfuscatedOutlineColor()) | ||
| 93 | ); | 94 | ); |
| 94 | } | 95 | } |
| 95 | 96 | ||
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 ecd17f28..f0117ee8 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 { | |||
| 151 | return getThemeColorRgba("Deobfuscated Outline"); | 151 | return getThemeColorRgba("Deobfuscated Outline"); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | public static Color getUnobfuscatedColor() { | ||
| 155 | return getThemeColorRgba("Unobfuscated"); | ||
| 156 | } | ||
| 157 | |||
| 158 | public static Color getUnobfuscatedOutlineColor() { | ||
| 159 | return getThemeColorRgba("Unobfuscated Outline"); | ||
| 160 | } | ||
| 161 | |||
| 154 | public static Color getEditorBackgroundColor() { | 162 | public static Color getEditorBackgroundColor() { |
| 155 | return getThemeColorRgb("Editor Background"); | 163 | return getThemeColorRgb("Editor Background"); |
| 156 | } | 164 | } |
| @@ -385,6 +393,10 @@ public final class UiConfig { | |||
| 385 | s.setIfAbsentDouble("Deobfuscated Alpha", 1.0); | 393 | s.setIfAbsentDouble("Deobfuscated Alpha", 1.0); |
| 386 | s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50A050); | 394 | s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50A050); |
| 387 | s.setIfAbsentDouble("Deobfuscated Outline Alpha", 1.0); | 395 | s.setIfAbsentDouble("Deobfuscated Outline Alpha", 1.0); |
| 396 | s.setIfAbsentRgbColor("Unobfuscated", 0x7FAAFF); | ||
| 397 | s.setIfAbsentDouble("Unobfuscated Alpha", 1.0); | ||
| 398 | s.setIfAbsentRgbColor("Unobfuscated Outline", 0x183060); | ||
| 399 | s.setIfAbsentDouble("Unobfuscated Outline Alpha", 1.0); | ||
| 388 | s.setIfAbsentRgbColor("Editor Background", 0xFFFFFF); | 400 | s.setIfAbsentRgbColor("Editor Background", 0xFFFFFF); |
| 389 | s.setIfAbsentRgbColor("Highlight", 0x3333EE); | 401 | s.setIfAbsentRgbColor("Highlight", 0x3333EE); |
| 390 | s.setIfAbsentRgbColor("Caret", 0x000000); | 402 | s.setIfAbsentRgbColor("Caret", 0x000000); |
| @@ -413,6 +425,10 @@ public final class UiConfig { | |||
| 413 | s.setIfAbsentDouble("Deobfuscated Alpha", 0.3); | 425 | s.setIfAbsentDouble("Deobfuscated Alpha", 0.3); |
| 414 | s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50FA7B); | 426 | s.setIfAbsentRgbColor("Deobfuscated Outline", 0x50FA7B); |
| 415 | s.setIfAbsentDouble("Deobfuscated Outline Alpha", 0.5); | 427 | s.setIfAbsentDouble("Deobfuscated Outline Alpha", 0.5); |
| 428 | s.setIfAbsentRgbColor("Unobfuscated", 0x3794FF); | ||
| 429 | s.setIfAbsentDouble("Unobfuscated Alpha", 0.3); | ||
| 430 | s.setIfAbsentRgbColor("Unobfuscated Outline", 0x3794FF); | ||
| 431 | s.setIfAbsentDouble("Unobfuscated Outline Alpha", 0.5); | ||
| 416 | s.setIfAbsentRgbColor("Editor Background", 0x282A36); | 432 | s.setIfAbsentRgbColor("Editor Background", 0x282A36); |
| 417 | s.setIfAbsentRgbColor("Highlight", 0xFF79C6); | 433 | s.setIfAbsentRgbColor("Highlight", 0xFF79C6); |
| 418 | s.setIfAbsentRgbColor("Caret", 0xF8F8F2); | 434 | s.setIfAbsentRgbColor("Caret", 0xF8F8F2); |