ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-04-14 21:56:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'add-rectangle-change-border-position' of https://github.com/GNS3/gns3-web-ui into add-rectangle-change-border-position

Browse Source
This commit is contained in:
Piotr Pekala 2018-12-11 06:14:07 -08:00
commit 78df22fae4
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/cartography/widgets/drawing.ts
View File

@ -46,6 +46,10 @@ export class DrawingWidget implements Widget {
.attr('transform', (d: MapDrawing) => {
return `translate(${d.x},${d.y}) rotate(${d.rotation})`;
});
this.drawingWidgets.forEach((widget) => {
widget.draw(drawing_body_merge);
});
drawing_body_merge
.select<SVGAElement>('line.top')
@ -112,11 +116,7 @@ export class DrawingWidget implements Widget {
.attr("cursor", "move");
drawing_body_merge
.classed('selected', (n: MapDrawing) => this.selectionManager.isSelected(n));
this.drawingWidgets.forEach((widget) => {
widget.draw(drawing_body_merge);
});
.classed('drawing_selected', (n: MapDrawing) => this.selectionManager.isSelected(n));
}
}

4
src/app/components/project-map/project-map.component.css
View File

@ -31,6 +31,10 @@ g.node:hover {
outline: none;
}
.mat-drawer-content {
display: inline !important;
}
.drawer-container {
height: 72px !important;
background: transparent;

2
src/app/components/project-map/project-map.component.ts
View File

@ -45,10 +45,8 @@ import { MapLabel } from '../../cartography/models/map/map-label';
import { D3MapComponent } from '../../cartography/components/d3-map/d3-map.component';
import { MapLinkNode } from '../../cartography/models/map/map-link-node';
import { TextElement } from '../../cartography/models/drawings/text-element';
import { FontFixer } from '../../cartography/helpers/font-fixer';
import { MapLabelToLabelConverter } from '../../cartography/converters/map/map-label-to-label-converter';
import { select } from 'd3-selection';
import { delay } from 'q';
@Component({