frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2568 from node-red-hitachi/fix-line-break-of-group-name 

fix line break of group label
This commit is contained in:
Nick O'Leary 2020-05-19 15:09:06 +01:00 committed by GitHub
parent fdc721baa1 5f5e6ea845
commit b8784185e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/node_modules/@node-red/editor-client/src/js/ui/view.js vendored
View File

@ -4156,7 +4156,7 @@ if (DEBUG_EVENTS) { console.warn("nodeMouseDown", mouse_mode,d); }
"stroke": d.stroke||"none",
})
g.on("mousedown",groupMouseDown).on("mouseup",groupMouseUp)
g.append('svg:text').attr("class","red-ui-flow-group-label").text(d.name);
g.append('svg:text').attr("class","red-ui-flow-group-label");
d.dirty = true;
});
if (addedGroups) {
@ -4207,12 +4207,20 @@ if (DEBUG_EVENTS) { console.warn("nodeMouseDown", mouse_mode,d); }
if (!d.minWidth) {
if (d.style.label && d.name) {
d.minWidth = calculateTextWidth(d.name||"","red-ui-flow-group-label",8);
d.labels = separateTextByLineBreak;
} else {
d.minWidth = 40;
}
}
d.w = Math.max(d.minWidth,d.w);
if (d.style.label && d.labels) {
var h = (d.labels.length -1) *15;
var labelPos = d.style["label-position"] || "nw";
d.h += h;
if (labelPos[0] === "n") {
d.y -= h;
}
}
g.attr("transform","translate("+d.x+","+d.y+")")
g.selectAll(".red-ui-flow-group-outline")
@ -4263,7 +4271,7 @@ if (DEBUG_EVENTS) { console.warn("nodeMouseDown", mouse_mode,d); }
if (labelPos[0] === 'n') {
labelY = 0+15; // Allow for font-height
} else {
labelY = d.h - 5;
labelY = d.h - 5 -(d.labels.length -1) *15;
}
if (labelPos[1] === 'w') {
labelX = 5;
@ -4275,10 +4283,22 @@ if (DEBUG_EVENTS) { console.warn("nodeMouseDown", mouse_mode,d); }
labelX = d.w/2;
labelAnchor = "middle"
}
label.text(d.name)
.style("fill", d.style.hasOwnProperty('color')?d.style.color:"#999")
.attr("transform","translate("+labelX+","+labelY+")")
.attr("text-anchor",labelAnchor);
label
.style("fill", d.style.hasOwnProperty('color')?d.style.color:"#999")
.attr("transform","translate("+labelX+","+labelY+")")
.attr("text-anchor",labelAnchor);
if (d.labels) {
var ypos = 0;
g.selectAll(".red-ui-flow-group-label-text").remove();
d.labels.forEach(function (name) {
label.append("tspan")
.classed("red-ui-flow-group-label-text", true)
.text(name)
.attr("x", 0)
.attr("y", ypos);
ypos += 15;
});
}
}
delete dirtyGroups[d.id];