github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 03:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

add node radius to circle radius for canvas shift

Browse Source
This commit is contained in:
David Kaltschmidt
2015-09-16 11:30:35 +02:00
parent 38fa82dee4
commit 7b9e1e2867
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/app/scripts/charts/nodes-chart.js
+9 -8
View File
@@ -288,23 +288,24 @@ const NodesChart = React.createClass({
const visibleWidth = Math.max(props.width - props.detailsWidth, 0);
const translate = state.translate;
const offsetX = translate[0];
if (offsetX + centerX + radius > visibleWidth) {
const outerRadius = radius + this.state.nodeScale(2);
if (offsetX + centerX + outerRadius > visibleWidth) {
// shift left if blocked by details
const shift = centerX + radius - visibleWidth;
const shift = centerX + outerRadius - visibleWidth;
translate[0] = -shift;
} else if (offsetX + centerX - radius < 0) {
} else if (offsetX + centerX - outerRadius < 0) {
// shift right if off canvas
const shift = offsetX - offsetX + centerX - radius;
const shift = offsetX - offsetX + centerX - outerRadius;
translate[0] = -shift;
}
const offsetY = translate[1];
if (offsetY + centerY + radius > props.height) {
if (offsetY + centerY + outerRadius > props.height) {
// shift up if past bottom
const shift = centerY + radius - props.height;
const shift = centerY + outerRadius - props.height;
translate[1] = -shift;
} else if (offsetY + centerY - radius - props.topMargin < 0) {
} else if (offsetY + centerY - outerRadius - props.topMargin < 0) {
// shift down if off canvas
const shift = offsetY - offsetY + centerY - radius - props.topMargin;
const shift = offsetY - offsetY + centerY - outerRadius - props.topMargin;
translate[1] = -shift;
}
client/app/scripts/components/app.js
+1 -1
View File
@@ -72,7 +72,7 @@ const App = React.createClass({
const showingDetails = this.state.selectedNodeId;
const versionString = this.state.version ? 'Version ' + this.state.version : '';
// width of details panel blocking a view
const detailsWidth = showingDetails ? 420 : 0;
const detailsWidth = showingDetails ? 450 : 0;
const topMargin = 100;
return (