-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FIX] Always fill the start and end flow markers
Changes - Avoid seeing the line over the markers on some zoom level for the conditional start diamond and the message flow end arrow. - For message flow, also fill the 'start circle' to avoid seeing the edge line and the line of the source shape. Implementation notes: - this requires custom code as mxgraph doesn't support filling the markers out of the box. - it is also possible to change the fill color as for other defaults.
- Loading branch information
Showing
4 changed files
with
88 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /** | ||
| * Copyright 2021 Bonitasoft S.A. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import { mxgraph } from '../initializer'; | ||
| import { mxAbstractCanvas2D, mxPoint } from 'mxgraph'; | ||
| import { StyleIdentifier } from '../StyleUtils'; // for types | ||
|
|
||
| /* eslint-disable @typescript-eslint/ban-ts-comment */ | ||
| export class BpmnConnector extends mxgraph.mxConnector { | ||
| constructor(points: mxPoint[], stroke: string, strokewidth?: number) { | ||
| super(points, stroke, strokewidth); | ||
| } | ||
|
|
||
| paintEdgeShape(c: mxAbstractCanvas2D, pts: mxPoint[]): void { | ||
| // The indirection via functions for markers is needed in | ||
| // order to apply the offsets before painting the line and | ||
| // paint the markers after painting the line. | ||
| // @ts-ignore wrong type returned by [email protected] | ||
| const sourceMarker: () => void = this.createMarker(c, pts, true); | ||
| // @ts-ignore wrong type returned by [email protected] | ||
| const targetMarker: () => void = this.createMarker(c, pts, false); | ||
|
|
||
| this.paintEdgeLine(c, pts); | ||
|
|
||
| // Disables shadows, dashed styles | ||
| c.setShadow(false); | ||
| c.setDashed(false, false); | ||
|
|
||
| if (sourceMarker != null) { | ||
| c.setFillColor(mxgraph.mxUtils.getValue(this.style, StyleIdentifier.EDGE_START_FILL_COLOR, this.stroke)); | ||
| sourceMarker(); | ||
| } | ||
|
|
||
| if (targetMarker != null) { | ||
| c.setFillColor(mxgraph.mxUtils.getValue(this.style, StyleIdentifier.EDGE_END_FILL_COLOR, this.stroke)); | ||
| targetMarker(); | ||
| } | ||
| } | ||
|
|
||
| // taken from mxPolyline, required as we cannot call mxPolyline method here (parent of the parent) | ||
| // we only support non STYLE_CURVED here (is possible with parent class) | ||
| private paintEdgeLine(c: mxAbstractCanvas2D, pts: mxPoint[]): void { | ||
| const prev = getPointerEventsValue(c); | ||
| setPointerEventsValue(c, 'stroke'); | ||
| this.paintLine(c, pts, this.isRounded); | ||
| setPointerEventsValue(c, prev); | ||
| } | ||
| } | ||
|
|
||
| function getPointerEventsValue(c: mxAbstractCanvas2D): string { | ||
| return c instanceof mxgraph.mxSvgCanvas2D ? c.pointerEventsValue : null; | ||
| } | ||
|
|
||
| function setPointerEventsValue(c: mxAbstractCanvas2D, value: string): void { | ||
| if (c instanceof mxgraph.mxSvgCanvas2D) { | ||
| c.pointerEventsValue = value; | ||
| } | ||
| } |