Skip to content

Commit b5ba7f7

Browse files
committed
feat(font/column-drag): add drag icon
Closes bpmn-io#37
1 parent d02be8b commit b5ba7f7

File tree

11 files changed

+325
-6
lines changed

11 files changed

+325
-6
lines changed

fonts/config.json

+14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@
2020
"bpmnio.plain"
2121
]
2222
},
23+
{
24+
"uid": "382b5bf0c5137fdc2c5ae552f0342141",
25+
"css": "drag",
26+
"code": 59415,
27+
"src": "custom_icons",
28+
"selected": true,
29+
"svg": {
30+
"path": "M562.5 750L750 750 750 937.5 562.5 937.5ZM562.5 437.5L750 437.5 750 625 562.5 625ZM250 750L437.5 750 437.5 937.5 250 937.5ZM250 437.5L437.5 437.5 437.5 625 250 625ZM562.5 125L750 125 750 312.5 562.5 312.5ZM250 125L437.5 125 437.5 312.5 250 312.5Z",
31+
"width": 1000
32+
},
33+
"search": [
34+
"drag"
35+
]
36+
},
2337
{
2438
"uid": "26613a2e6bc41593c54bead46f8c8ee3",
2539
"css": "file-code",

fonts/dmn-js.eot

112 Bytes
Binary file not shown.

fonts/dmn-js.svg

+2-1
Loading

fonts/dmn-js.ttf

112 Bytes
Binary file not shown.

fonts/dmn-js.woff

72 Bytes
Binary file not shown.

fonts/source/raw/drag.svg

+246
Loading

fonts/source/symbols/drag.svg

+49
Loading

lib/features/column-drag/ColumnDrag.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ function ColumnDrag(eventBus, sheet, elementRegistry, modeling) {
3535
this.moveLeft = false;
3636

3737
eventBus.on('element.mousedown', function(event) {
38-
if(event.originalEvent.target.getAttribute('class') === 'drag-handle') {
38+
var hasDragHandle = domClasses(event.originalEvent.target).has('drag-handle');
39+
40+
if(hasDragHandle) {
3941
event.preventDefault();
4042
self.startDragging(event.element);
4143
self.setLastDragPoint(event.originalEvent);

lib/features/column-drag/DragRenderer.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,18 @@ function DragRenderer(
1010
eventBus.on('cell.render', function(event) {
1111
if (event.data.row.isClauseRow) {
1212
domClasses(event.gfx).add('draggable');
13-
if(event.gfx.lastChild.getAttribute('class') !== 'drag-handle') {
14-
event.gfx.appendChild(domify('<span class="drag-handle"></span>'));
13+
14+
var hasDragHandle = domClasses(event.gfx.lastChild).has('drag-handle');
15+
16+
if(!hasDragHandle) {
17+
event.gfx.appendChild(domify('<span class="drag-handle dmn-icon-drag"></span>'));
1518
}
1619
}
20+
21+
// add drag icon for rows
22+
if (event.data.column === utilityColumn.getColumn() && !event.data.row.isFoot && !event.data.row.isHead) {
23+
domClasses(event.gfx).add('dmn-icon-drag');
24+
}
1725
});
1826
}
1927

styles/dmn-dragdrop.less

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
&:before {
4040
float: left;
41-
content: '\283F';
4241
cursor: move;
4342
cursor: ns-resize;
4443
}
@@ -70,7 +69,6 @@
7069
&:before {
7170
position: relative;
7271
top: 2px;
73-
content: '\283F';
7472
display: inline-block;
7573
}
7674
}

styles/dmn-font.less

+1
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@
8181
.dmn-icon-resize-big:before { content: '\e814'; } /* 'î ”' */
8282
.dmn-icon-resize-small:before { content: '\e815'; } /* 'î •' */
8383
.dmn-icon-file-code:before { content: '\e816'; } /* 'î –' */
84+
.dmn-icon-drag:before { content: '\e817'; } /* '' */

0 commit comments

Comments
 (0)