From 7f99263a5e6c1c410a73adf910c310c8fe7ec72c Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Mon, 5 Dec 2016 21:55:12 +0100 Subject: [PATCH] fix(draw): color Transaction inner rect --- lib/draw/BpmnRenderer.js | 4 +- test/fixtures/bpmn/draw/colors.bpmn | 471 ++++++++++++++++------------ 2 files changed, 266 insertions(+), 209 deletions(-) diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js index cf516b62..1fbc3b4c 100644 --- a/lib/draw/BpmnRenderer.js +++ b/lib/draw/BpmnRenderer.js @@ -1050,7 +1050,9 @@ function BpmnRenderer(eventBus, styles, pathMap, canvas, priority) { 'bpmn:Transaction': function(parentGfx, element) { var outer = renderer('bpmn:SubProcess')(parentGfx, element); - var innerAttrs = styles.style([ 'no-fill', 'no-events' ]); + var innerAttrs = styles.style([ 'no-fill', 'no-events' ], { + stroke: getStrokeColor(element) + }); /* inner path */ drawRect(parentGfx, element.width, element.height, TASK_BORDER_RADIUS - 2, INNER_OUTER_DIST, innerAttrs); diff --git a/test/fixtures/bpmn/draw/colors.bpmn b/test/fixtures/bpmn/draw/colors.bpmn index ef2adc1b..c46f0d9f 100644 --- a/test/fixtures/bpmn/draw/colors.bpmn +++ b/test/fixtures/bpmn/draw/colors.bpmn @@ -1,356 +1,411 @@ - + + + + - - SequenceFlow_1jrsqqc - - - - SequenceFlow_1jrsqqc - SequenceFlow_0h9s0mp - - - - SequenceFlow_0h9s0mp - SequenceFlow_0pqo7zt - SequenceFlow_1qt82pt - - - - SequenceFlow_0pqo7zt - SequenceFlow_152w54z - - - - SequenceFlow_1qt82pt - SequenceFlow_17ohrlh - - - - SequenceFlow_17ohrlh - - - - SequenceFlow_152w54z - SequenceFlow_1xvnonz - - + + + + + + + + + + + + + + + + + + + + SequenceFlow_1xbxd38 + SequenceFlow_1ooycy6 + + + SequenceFlow_0krol9j + + + SequenceFlow_0krol9j + + + + + SequenceFlow_1u8uz5a + + + SequenceFlow_0ld619c + + + SequenceFlow_1ooycy6 + + + SequenceFlow_02klp91 + SequenceFlow_1xbxd38 + + + + + SequenceFlow_096z65r + SequenceFlow_17yh2em + SequenceFlow_0ld619c + + + SequenceFlow_024djlt + SequenceFlow_096z65r + + + + SequenceFlow_1hytpfi + SequenceFlow_1u8uz5a + + + SequenceFlow_17fk7n7 + SequenceFlow_1hytpfi + SequenceFlow_17yh2em + + + SequenceFlow_01w8xpk + SequenceFlow_17fk7n7 + + + SequenceFlow_0mbw4et + SequenceFlow_01w8xpk + + SequenceFlow_1xvnonz SequenceFlow_0mbw4et SequenceFlow_024djlt SequenceFlow_02klp91 - - SequenceFlow_0mbw4et - SequenceFlow_01w8xpk - - - - - SequenceFlow_01w8xpk - SequenceFlow_17fk7n7 + + SequenceFlow_152w54z + SequenceFlow_1xvnonz - - - SequenceFlow_17fk7n7 - SequenceFlow_1hytpfi - SequenceFlow_17yh2em + + SequenceFlow_17ohrlh + + + SequenceFlow_1qt82pt + SequenceFlow_17ohrlh + + + SequenceFlow_0pqo7zt + SequenceFlow_152w54z + + + SequenceFlow_0h9s0mp + SequenceFlow_0pqo7zt + SequenceFlow_1qt82pt - - - SequenceFlow_1hytpfi - SequenceFlow_1u8uz5a - - - - SequenceFlow_1u8uz5a - - - - SequenceFlow_024djlt - SequenceFlow_096z65r - - - - - SequenceFlow_096z65r - SequenceFlow_17yh2em - SequenceFlow_0ld619c - - - - - SequenceFlow_0ld619c - - - - SequenceFlow_02klp91 - SequenceFlow_0rng9d2 + + SequenceFlow_1jrsqqc + SequenceFlow_0h9s0mp + + + DataStoreReference_1clvrcw + Property_1vr5ovt + + + + SequenceFlow_1jrsqqc - - - - SequenceFlow_0rng9d2 - SequenceFlow_0krol9j - - - - SequenceFlow_0krol9j - SequenceFlow_1h7edo4 - - - - SequenceFlow_1h7edo4 - - + + + + - - + + - - + + - + - + - - + + - + - + - + - - + + - + - + - - + + - + - + - - - + + + - + - + - + - - + + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - + - - + + - - - - - + + + + + - + - + - - + + - + - + - - + + - + - + - + - - + + - + - + - + - - + + - + - + - - + + - + - - - + + + - + - + - + - - + + - + - + - + - - - - - - - - - + - - - - - - - - + - - + + - + - + - + - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +