From a9d8ea7a20287626959716d9392f4474faeffc88 Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Wed, 20 Jan 2016 16:50:01 +0100 Subject: [PATCH] fix(draw): correct compensation look and feel --- lib/draw/BpmnRenderer.js | 4 +- lib/draw/PathMap.js | 8 +- test/fixtures/bpmn/draw/events.bpmn | 640 ++++++++++++++++------------ 3 files changed, 378 insertions(+), 274 deletions(-) diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js index d9439e1e..e244fce5 100644 --- a/lib/draw/BpmnRenderer.js +++ b/lib/draw/BpmnRenderer.js @@ -523,8 +523,8 @@ function BpmnRenderer(eventBus, styles, pathMap, priority) { containerWidth: event.width, containerHeight: event.height, position: { - mx: 0.201, - my: 0.472 + mx: 0.22, + my: 0.5 } }); diff --git a/lib/draw/PathMap.js b/lib/draw/PathMap.js index 1be66e3c..2345f1b2 100644 --- a/lib/draw/PathMap.js +++ b/lib/draw/PathMap.js @@ -98,11 +98,11 @@ function PathMap() { widthElements: [4.75, 8.5] }, 'EVENT_COMPENSATION': { - d: 'm {mx},{my} {e.x0},-{e.y0} 0,{e.y1} z m {e.x0},0 {e.x0},-{e.y0} 0,{e.y1} z', + d: 'm {mx},{my} {e.x0},-{e.y0} 0,{e.y1} z m {e.x1},-{e.y2} {e.x2},-{e.y3} 0,{e.y1} -{e.x2},-{e.y3} z', height: 36, width: 36, - heightElements: [5, 10], - widthElements: [10] + heightElements: [6.5, 13, 0.4, 6.1], + widthElements: [9, 9.3, 8.7] }, 'EVENT_TIMER_WH': { d: 'M {mx},{my} l {e.x0},-{e.y0} m -{e.x0},{e.y0} l {e.x1},{e.y1} ', @@ -237,7 +237,7 @@ function PathMap() { widthElements: [] }, 'MARKER_COMPENSATION': { - d: 'm {mx},{my} 8,-5 0,10 z m 9,0 8,-5 0,10 z', + d: 'm {mx},{my} 7,-5 0,10 z m 7.1,-0.3 6.9,-4.7 0,10 -6.9,-4.7 z', height: 10, width: 21, heightElements: [], diff --git a/test/fixtures/bpmn/draw/events.bpmn b/test/fixtures/bpmn/draw/events.bpmn index a6144f92..79add36f 100644 --- a/test/fixtures/bpmn/draw/events.bpmn +++ b/test/fixtures/bpmn/draw/events.bpmn @@ -1,270 +1,374 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +