frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Editor: If there is an input/output port on the node, give the icon more space.

Browse Source
This commit is contained in:
Bruno Feurer 2022-08-30 15:03:16 +02:00
parent 30ea300f65
commit 21ac30b557
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4134,20 +4134,22 @@ RED.view = (function() {
iconUrl = RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file; iconUrl = RED.settings.apiRootUrl+"icons/"+iconPath.module+"/"+iconPath.file;
} }
} }
const rightAlign = "right" === d._def.align
const offsetX = d.inputs && !rightAlign ? 2 : d.outputs && rightAlign ? -2 : 0
if (fontAwesomeUnicode) { if (fontAwesomeUnicode) {
// Since Node-RED workspace uses SVG, i tag cannot be used for font-awesome icon. // Since Node-RED workspace uses SVG, i tag cannot be used for font-awesome icon.
// On SVG, use text tag as an alternative. // On SVG, use text tag as an alternative.
icon_group.append("text") icon_group.append("text")
.attr("xlink:href",iconUrl) .attr("xlink:href",iconUrl)
.attr("class","fa-lg") .attr("class","fa-lg")
.attr("x",15) .attr("x",15+offsetX)
.text(fontAwesomeUnicode); .text(fontAwesomeUnicode);
} else { } else {
var icon = icon_group.append("image") var icon = icon_group.append("image")
.style("display","none") .style("display","none")
.attr("xlink:href",iconUrl) .attr("xlink:href",iconUrl)
.attr("class","red-ui-flow-node-icon") .attr("class","red-ui-flow-node-icon")
.attr("x",0) .attr("x",0+offsetX)
.attr("width","30") .attr("width","30")
.attr("height","30"); .attr("height","30");
@ -4164,7 +4166,7 @@ RED.view = (function() {
var height = img.height * scaleFactor; var height = img.height * scaleFactor;
icon.attr("width",width); icon.attr("width",width);
icon.attr("height",height); icon.attr("height",height);
icon.attr("x",15-width/2); icon.attr("x",15-width/2+offsetX);
} }
icon.attr("xlink:href",iconUrl); icon.attr("xlink:href",iconUrl);
icon.style("display",null); icon.style("display",null);
@ -4741,7 +4743,7 @@ RED.view = (function() {
if ((!d._def.align && d.inputs !== 0 && d.outputs === 0) || "right" === d._def.align) { if ((!d._def.align && d.inputs !== 0 && d.outputs === 0) || "right" === d._def.align) {
if (this.__iconGroup__) { if (this.__iconGroup__) {
this.__iconGroup__.classList.add("red-ui-flow-node-icon-group-right"); this.__iconGroup__.classList.add("red-ui-flow-node-icon-group-right");
this.__iconGroup__.setAttribute("transform", "translate("+(d.w-30)+",0)"); this.__iconGroup__.setAttribute("transform", "translate("+(d.w-(d.outputs ? 32 : 30))+",0)");
} }
this.__textGroup__.classList.add("red-ui-flow-node-label-right"); this.__textGroup__.classList.add("red-ui-flow-node-label-right");
this.__textGroup__.setAttribute("transform", "translate("+(d.w-38)+","+yp+")"); this.__textGroup__.setAttribute("transform", "translate("+(d.w-38)+","+yp+")");
@ -4877,9 +4879,8 @@ RED.view = (function() {
icon.attr("y",function(){return (d.h-d3.select(this).attr("height"))/2;}); icon.attr("y",function(){return (d.h-d3.select(this).attr("height"))/2;});
const iconShadeHeight = d.h const iconShadeHeight = d.h
const iconShadeWidth = 30 const iconShadeWidth = d.inputs && d.outputs ? 32 : 30
this.__iconShade__.setAttribute("d", hideLabel ? this.__iconShade__.setAttribute("d", hideLabel ?
`M5 0 h${iconShadeWidth-10} a 5 5 0 0 1 5 5 v${iconShadeHeight-10} a 5 5 0 0 1 -5 5 h-${iconShadeWidth-10} a 5 5 0 0 1 -5 -5 v-${iconShadeHeight-10} a 5 5 0 0 1 5 -5` : ( `M5 0 h${iconShadeWidth-10} a 5 5 0 0 1 5 5 v${iconShadeHeight-10} a 5 5 0 0 1 -5 5 h-${iconShadeWidth-10} a 5 5 0 0 1 -5 -5 v-${iconShadeHeight-10} a 5 5 0 0 1 5 -5` : (
"right" === d._def.align ? "right" === d._def.align ?
@ -4889,7 +4890,7 @@ RED.view = (function() {
) )
this.__iconShadeBorder__.style.display = hideLabel?'none':'' this.__iconShadeBorder__.style.display = hideLabel?'none':''
this.__iconShadeBorder__.setAttribute("d", this.__iconShadeBorder__.setAttribute("d",
"M " + (((!d._def.align && d.inputs !== 0 && d.outputs === 0) || "right" === d._def.align) ? 0.5 : 29.5) + " "+(d.selected?1:0.5)+" l 0 " + (d.h - (d.selected?2:1)) "M " + (((!d._def.align && d.inputs !== 0 && d.outputs === 0) || "right" === d._def.align) ? 0.5 : iconShadeWidth-0.5) + " "+(d.selected?1:0.5)+" l 0 " + (d.h - (d.selected?2:1))
); );
faIcon.attr("y",(d.h+13)/2); faIcon.attr("y",(d.h+13)/2);
} }