Merge pull request #4223 from cwisniew/fix-sheet-css

fixes for missing scrollbar values
RPTools · Jul 29, 2023 · 5811998 · 5811998
2 parents a1ad295 + c3eb15c
commit 5811998
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/net/rptools/maptool/model/library/builtin/themecss/ScrollBarCSSContext.java b/src/main/java/net/rptools/maptool/model/library/builtin/themecss/ScrollBarCSSContext.java
@@ -68,9 +68,11 @@ public ScrollBarCSSContext(UIDefaults uiDef, Function<Color, String> formatColor
     showButtons = uiDef.getBoolean("ScrollBar.showButtons") ? 1 : 0;
     thumbHighlightColor = formatColor.apply(uiDef.getColor("ScrollBar.thumbHighlight"));
     thumbArc = uiDef.getInt("ScrollBar.thumbArc");
-    thumbBorderColor = formatColor.apply(uiDef.getColor("ScrollBar.thumbBorderColor"));
     thumbShadowColor = formatColor.apply(uiDef.getColor("ScrollBar.thumbShadow"));
-    thumbDarkShadowColor = formatColor.apply(uiDef.getColor("ScrollBar.thumbDarkShadow"));
+    var dscol = uiDef.getColor("ScrollBar.thumbDarkShadow");
+    thumbDarkShadowColor = dscol != null ? formatColor.apply(dscol) : thumbShadowColor;
+    var tcol = uiDef.getColor("ScrollBar.thumbBorderColor");
+    thumbBorderColor = tcol != null ? formatColor.apply(tcol) : thumbShadowColor;
     thumbColor = formatColor.apply(uiDef.getColor("ScrollBar.thumb"));
     thumbInsetsLeft = uiDef.getInt("ScrollBar.thumbInsets.left");
     thumbInsetsTop = uiDef.getInt("ScrollBar.thumbInsets.top");