Skip to content

Commit 6e9cb40

Browse files
committed
small fixes for pattern fill
1 parent 9f7ce1d commit 6e9cb40

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Diff for: src/components/drawing/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ drawing.pattern = function(sel, gd, patternID, shape, bgcolor, fgcolor, size, so
486486

487487
var pattern = fullLayout._defs.select('.patterns')
488488
.selectAll('#' + fullID)
489-
.data([shape + ';' + bgcolor + ';' + fgcolor + ';' + size + ';' + solidity]);
489+
.data([shape + ';' + bgcolor + ';' + fgcolor + ';' + size + ';' + solidity], Lib.identity);
490490

491491
pattern.exit().remove();
492492

@@ -692,8 +692,8 @@ drawing.singlePointStyle = function(d, sel, trace, fns, gd) {
692692
[[0, gradientColor], [1, fillColor]], 'fill');
693693
} else if(patternShape) {
694694
var patternBGColor = getPatternAttr(markerPattern.bgcolor, d.i, null);
695-
var patternSize = getPatternAttr(markerPattern.size, d.i, 1);
696-
var patternSolidity = getPatternAttr(markerPattern.solidity, d.i, 1);
695+
var patternSize = getPatternAttr(markerPattern.size, d.i, 8);
696+
var patternSolidity = getPatternAttr(markerPattern.solidity, d.i, 0.3);
697697
var perPointPattern = Array.isArray(markerPattern.shape) ||
698698
Array.isArray(markerPattern.bgcolor) ||
699699
Array.isArray(markerPattern.size) ||

Diff for: src/components/legend/style.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,9 @@ module.exports = function style(s, gd, legend) {
373373

374374
if(patternShape) {
375375
var patternBGColor = getPatternAttr(markerPattern.bgcolor, null);
376-
var patternSize = getPatternAttr(markerPattern.size, 1);
377-
var patternSolidity = getPatternAttr(markerPattern.solidity, 1);
378-
var patternID = trace.uid;
376+
var patternSize = Math.min(12, getPatternAttr(markerPattern.size, 8));
377+
var patternSolidity = getPatternAttr(markerPattern.solidity, 0.3);
378+
var patternID = 'legend-' + trace.uid;
379379
p.call(Drawing.pattern, gd, patternID, patternShape, patternBGColor,
380380
fillColor, patternSize, patternSolidity, 'fill');
381381
} else {

Diff for: src/traces/bar/style_defaults.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = function handleStyleDefaults(traceIn, traceOut, coerce, default
2424
coerce('marker.line.width');
2525
coerce('marker.opacity');
2626
var pattern = coerce('marker.pattern.shape');
27-
if (pattern) {
27+
if(pattern) {
2828
coerce('marker.pattern.bgcolor');
2929
coerce('marker.pattern.size');
3030
coerce('marker.pattern.solidity');

0 commit comments

Comments
 (0)