NetworkNodeCanvasVisualization: leave a whole annotationSpacing (defa…

…ult 4px) space around icon

It is hard to justify why there should be half as much space between
between the icon and the first annotation, than between two subsequent
annotations.

In addition, the default 4px/2 = 2px is clearly to small.
Before fixing the "+32px for submodule label" bug a few commits ago,
gap used to be much larger, but now it's really just 2px.

src/inet/visualizer/canvas/scene/NetworkNodeCanvasVisualization.cc

@@ -215,10 +215,10 @@ void NetworkNodeCanvasVisualization::layout()
     std::vector<cFigure::Rectangle> rcs; // rectangles of annotations already positioned
     std::vector<cFigure::Point> pts; // candidate points where annotations may be positioned
     cFigure::Rectangle extendendSubmoduleBounds = submoduleBounds;
-    extendendSubmoduleBounds.x -= annotationSpacing / 2;
-    extendendSubmoduleBounds.y -= annotationSpacing / 2;
-    extendendSubmoduleBounds.width += annotationSpacing;
-    extendendSubmoduleBounds.height += annotationSpacing;
+    extendendSubmoduleBounds.x -= annotationSpacing;
+    extendendSubmoduleBounds.y -= annotationSpacing;
+    extendendSubmoduleBounds.width += 2 * annotationSpacing;
+    extendendSubmoduleBounds.height += 2 * annotationSpacing;
     rcs.push_back(extendendSubmoduleBounds);
     pts.push_back(getTopLeft(extendendSubmoduleBounds));
     pts.push_back(getTopCenter(extendendSubmoduleBounds));