Browse Source

SVG: Write back fallback-opacity values to the internal svg representation s.t. it doesn't get lost during laf change.

pull/245/head
weisj 4 years ago
parent
commit
7124da004d
No known key found for this signature in database
GPG Key ID: 31124CB75461DA2A
  1. 14
      property-loader/src/main/java/com/github/weisj/darklaf/icons/IconColorMapper.java

14
property-loader/src/main/java/com/github/weisj/darklaf/icons/IconColorMapper.java

@ -122,7 +122,8 @@ public final class IconColorMapper {
Color c = resolveColor(id, getFallbacks(colorFallbacks), FALLBACK_COLOR, defaults, contextDefaults); Color c = resolveColor(id, getFallbacks(colorFallbacks), FALLBACK_COLOR, defaults, contextDefaults);
Pair<LinearGradient, Runnable> result = Pair<LinearGradient, Runnable> result =
createColor(c, id, opacityKey, colorFallbacks, opacity1, opacity2); createColor(c, id, opacityKey, new StyleAttribute[] {colorFallbacks, opacityFallbacks},
opacity1, opacity2);
LinearGradient gradient = result.getFirst(); LinearGradient gradient = result.getFirst();
Runnable finalizer = result.getSecond(); Runnable finalizer = result.getSecond();
themedDefs.loaderAddChild(null, gradient); themedDefs.loaderAddChild(null, gradient);
@ -215,14 +216,19 @@ public final class IconColorMapper {
} }
private static Pair<LinearGradient, Runnable> createColor(final Color c, final String name, final String opacityKey, private static Pair<LinearGradient, Runnable> createColor(final Color c, final String name, final String opacityKey,
final StyleAttribute fallbacks, final float opacity1, final float opacity2) throws SVGElementException { final StyleAttribute[] extraAttributes, final float opacity1, final float opacity2)
throws SVGElementException {
LinearGradient grad = new LinearGradient(); LinearGradient grad = new LinearGradient();
grad.addAttribute("id", AnimationElement.AT_XML, name); grad.addAttribute("id", AnimationElement.AT_XML, name);
if (opacityKey != null && !opacityKey.isEmpty()) { if (opacityKey != null && !opacityKey.isEmpty()) {
grad.addAttribute("opacity", AnimationElement.AT_XML, opacityKey); grad.addAttribute("opacity", AnimationElement.AT_XML, opacityKey);
} }
if (fallbacks != null && !fallbacks.getStringValue().isEmpty()) { if (extraAttributes != null) {
grad.addAttribute(fallbacks.getName(), AnimationElement.AT_XML, fallbacks.getStringValue()); for (StyleAttribute attribute : extraAttributes) {
if (attribute != null && !attribute.getStringValue().isEmpty()) {
grad.addAttribute(attribute.getName(), AnimationElement.AT_XML, attribute.getStringValue());
}
}
} }
return new Pair<>(grad, () -> { return new Pair<>(grad, () -> {
Stop stop1 = new Stop(); Stop stop1 = new Stop();

Loading…
Cancel
Save