A couple more tweaks to the network-bar position.

- Center it vertically properly.
This commit is contained in:
Simon Howe
2016-07-12 18:29:15 +02:00
parent 6a79938939
commit 55bed7b7b6
3 changed files with 6 additions and 8 deletions

View File

@@ -5,8 +5,8 @@ import { getNetworkColor } from '../utils/color-utils';
import { isContrastMode } from '../utils/contrast-utils';
const barHeight = 5;
// Gap size between bar segments.
const minBarHeight = 3;
const padding = 0.05;
const rx = 1;
const ry = rx;
@@ -16,6 +16,7 @@ function NodeNetworksOverlay({offset, size, stack, networks = makeList()}) {
// Min size is about a quarter of the width, feels about right.
const minBarWidth = (size / 4);
const barWidth = Math.max(size, minBarWidth * networks.size);
const barHeight = Math.max(size * 0.085, minBarHeight);
// Update singleton scale.
x.domain(networks.map((n, i) => i).toJS());
@@ -24,7 +25,7 @@ function NodeNetworksOverlay({offset, size, stack, networks = makeList()}) {
const bars = networks.map((n, i) => (
<rect
x={x(i)}
y={offset}
y={offset - barHeight * 0.5}
width={x.rangeBand()}
height={barHeight}
rx={rx}

View File

@@ -87,7 +87,8 @@ class Node extends React.Component {
const labelTransform = focused ? `scale(${1 / zoomScale})` : '';
const labelWidth = nodeScale(scaleFactor * 4);
const labelOffsetX = -labelWidth / 2;
let labelOffsetY = focused ? nodeScale(0.5) : nodeScale(0.5 * scaleFactor);
const labelDy = (showingNetworks && networks) ? 0.75 : 0.60;
const labelOffsetY = focused ? nodeScale(labelDy) : nodeScale(labelDy * scaleFactor);
const nodeClassName = classnames('node', {
highlighted,
@@ -103,10 +104,7 @@ class Node extends React.Component {
const NodeShapeType = getNodeShape(this.props);
const useSvgLabels = exportingGraph;
const size = nodeScale(scaleFactor);
const networkOffset = nodeScale(scaleFactor * 0.65);
if (showingNetworks && networks) {
labelOffsetY += (focused ? 12 : 8);
}
const networkOffset = focused ? nodeScale(scaleFactor * 0.67) : nodeScale(0.67);
return (
<g className={nodeClassName} transform={transform}

View File

@@ -358,7 +358,6 @@ h2 {
.node-label-wrapper {
cursor: pointer;
padding-top: 6px;
}
.node-sublabel {