orange!

QuiltMC · Dec 1, 2024 · b2a7c6f · b2a7c6f
1 parent 0a635dd
commit b2a7c6f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/theme/ThemeUtil.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/theme/ThemeUtil.java
@@ -96,8 +96,7 @@ public static BoxHighlightPainter createDebugPainter() {
 	}
 
 	public static BoxHighlightPainter createFallbackPainter() {
-		// todo proper colours
-		return BoxHighlightPainter.create(Config.getCurrentSyntaxPaneColors().proposed.value(), Config.getCurrentSyntaxPaneColors().debugTokenOutline.value());
+		return BoxHighlightPainter.create(Config.getCurrentSyntaxPaneColors().fallback.value(), Config.getCurrentSyntaxPaneColors().fallbackOutline.value());
 	}
 
 	public static <T> void resetIfAbsent(TrackedValue<T> value) {

diff --git a/...n/java/org/quiltmc/enigma/gui/config/theme/properties/composite/SyntaxPaneProperties.java b/...n/java/org/quiltmc/enigma/gui/config/theme/properties/composite/SyntaxPaneProperties.java
@@ -49,6 +49,9 @@ public static class Colors implements Consumer<Config.SectionBuilder> {
 		public final TrackedValue<ThemeProperties.SerializableColor> deobfuscated;
 		public final TrackedValue<ThemeProperties.SerializableColor> deobfuscatedOutline;
 
+		public final TrackedValue<ThemeProperties.SerializableColor> fallback;
+		public final TrackedValue<ThemeProperties.SerializableColor> fallbackOutline;
+
 		public final TrackedValue<ThemeProperties.SerializableColor> editorBackground;
 		public final TrackedValue<ThemeProperties.SerializableColor> highlight;
 		public final TrackedValue<ThemeProperties.SerializableColor> caret;
@@ -78,6 +81,9 @@ private Colors(
 				ThemeProperties.SerializableColor deobfuscated,
 				ThemeProperties.SerializableColor deobfuscatedOutline,
 
+				ThemeProperties.SerializableColor fallback,
+				ThemeProperties.SerializableColor fallbackOutline,
+
 				ThemeProperties.SerializableColor editorBackground,
 				ThemeProperties.SerializableColor highlight,
 				ThemeProperties.SerializableColor caret,
@@ -106,6 +112,9 @@ private Colors(
 			this.deobfuscated = TrackedValue.create(deobfuscated, "deobfuscated");
 			this.deobfuscatedOutline = TrackedValue.create(deobfuscatedOutline, "deobfuscated_outline");
 
+			this.fallback = TrackedValue.create(fallback, "fallback");
+			this.fallbackOutline = TrackedValue.create(fallback, "fallbackOutline");
+
 			this.editorBackground = TrackedValue.create(editorBackground, "editor_background");
 			this.highlight = TrackedValue.create(highlight, "highlight");
 			this.caret = TrackedValue.create(caret, "caret");
@@ -142,6 +151,9 @@ public Stream<TrackedValue<ThemeProperties.SerializableColor>> stream() {
 				this.deobfuscated,
 				this.deobfuscatedOutline,
 
+				this.fallback,
+				this.fallbackOutline,
+
 				this.editorBackground,
 				this.highlight,
 				this.caret,
@@ -177,6 +189,11 @@ public static class Builder {
 			private ThemeProperties.SerializableColor deobfuscated = new ThemeProperties.SerializableColor(0xFFDCFFDC);
 			private ThemeProperties.SerializableColor deobfuscatedOutline = new ThemeProperties.SerializableColor(0xFF50A050);
 
+			// todo defaults for other themes
+			// todo better colours
+			private ThemeProperties.SerializableColor fallback = new ThemeProperties.SerializableColor(0x60eb8f34);
+			private ThemeProperties.SerializableColor fallbackOutline = new ThemeProperties.SerializableColor(0xFFeb8f34);
+
 			private ThemeProperties.SerializableColor editorBackground = new ThemeProperties.SerializableColor(0xFFFFFFFF);
 			private ThemeProperties.SerializableColor highlight = new ThemeProperties.SerializableColor(0xFF3333EE);
 			private ThemeProperties.SerializableColor caret = new ThemeProperties.SerializableColor(0xFF000000);
@@ -207,6 +224,9 @@ public Colors build() {
 					this.deobfuscated,
 					this.deobfuscatedOutline,
 
+					this.fallback,
+					this.fallbackOutline,
+
 					this.editorBackground,
 					this.highlight,
 					this.caret,
@@ -270,6 +290,16 @@ public Builder deobfuscatedOutline(ThemeProperties.SerializableColor deobfuscate
 				return this;
 			}
 
+			public Builder fallback(ThemeProperties.SerializableColor fallback) {
+				this.fallback = fallback;
+				return this;
+			}
+
+			public Builder fallbackOutline(ThemeProperties.SerializableColor fallbackOutline) {
+				this.fallbackOutline = fallbackOutline;
+				return this;
+			}
+
 			public Builder editorBackground(ThemeProperties.SerializableColor editorBackground) {
 				this.editorBackground = editorBackground;
 				return this;