ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Fixed different font faces cause graph nodes to expand to more grid cells

Browse Source
This commit is contained in:
Eberhard Graether
2017-02-09 15:26:14 +01:00
parent 06676eda66
commit e08f7ce2c0
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+11 -10
View File
@@ -1308,26 +1308,22 @@ void GraphController::addExpandToggleNode(DummyNode* node) const
void GraphController::layoutToGrid(DummyNode* node) const
{
if (!node->visible)
if (!node->visible || !node->isGraphNode() || !node->hasVisibleSubNode())
{
return;
}
// Increase size of nodes with visible chilren to cover full grid cells
size_t width = GraphViewStyle::toGridSize(node->size.x);
size_t height = GraphViewStyle::toGridSize(node->size.y);
size_t incX = width - node->size.x;
size_t incY = height - node->size.y;
node->size.x = width;
node->size.y = height;
if (!node->isGraphNode())
{
return;
}
DummyNode* lastAccessNode = nullptr;
DummyNode* expandToggleNode = nullptr;
for (std::shared_ptr<DummyNode> subNode : node->subNodes)
{
if (!subNode->visible)
@@ -1342,13 +1338,18 @@ void GraphController::layoutToGrid(DummyNode* node) const
}
else if (subNode->isExpandToggleNode())
{
subNode->position.x = subNode->position.x + incX;
expandToggleNode = subNode.get();
}
}
if (lastAccessNode)
{
lastAccessNode->size.y = lastAccessNode->size.y + incY;
expandToggleNode->position.x = expandToggleNode->position.x + incX;
node->size.x = width;
node->size.y = height;
}
}