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

src: Fixes for release

Browse Source 
* Fixed annotations in code view when showing errors
* Fixed context menu hatched for non-indexed/incomplete file button
* Fixed file minimize button losing hover style when leaving to file bar
* Fixed only change bookmark button state when active node is bookmarked
* Fixed use bezier edges when expanding node on aggregation graph
* Fixed manually expanded nodes stay expanded
This commit is contained in:
Eberhard Graether
2017-06-07 17:46:16 +02:00
parent 2b1098fe1d
commit 610dbf5bfb
12 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/GraphController.cpp
+12 -9
View File
@@ -21,6 +21,7 @@
GraphController::GraphController(StorageAccess* storageAccess)
: m_storageAccess(storageAccess)
, m_useBezierEdges(false)
{
}
@@ -86,7 +87,7 @@ void GraphController::handleMessage(MessageActivateTokens* message)
std::vector<Id> tokenIds = utility::concat(m_activeNodeIds, m_activeEdgeIds);
bool isNamespace = false;
std::shared_ptr<Graph> graph = m_storageAccess->getGraphForActiveTokenIds(tokenIds, &isNamespace);
std::shared_ptr<Graph> graph = m_storageAccess->getGraphForActiveTokenIds(tokenIds, getExpandedNodeIds(), &isNamespace);
createDummyGraphForTokenIdsAndSetActiveAndVisibility(tokenIds, graph);
@@ -108,6 +109,11 @@ void GraphController::handleMessage(MessageActivateTokens* message)
assignBundleIds();
}
if (message->isAggregation)
{
m_useBezierEdges = true;
}
buildGraph(message, !isNamespace, true, isNamespace);
}
@@ -318,7 +324,7 @@ void GraphController::handleMessage(MessageGraphNodeExpand* message)
break;
}
std::shared_ptr<Graph> aggregationGraph = m_storageAccess->getGraphForActiveTokenIds(aggregationIds);
std::shared_ptr<Graph> aggregationGraph = m_storageAccess->getGraphForActiveTokenIds(aggregationIds, std::vector<Id>());
aggregationGraph->forEachEdge(
[this](Edge* e)
@@ -396,6 +402,8 @@ void GraphController::clear()
m_graph.reset();
m_useBezierEdges = false;
getView()->clear();
}
@@ -474,6 +482,7 @@ void GraphController::createDummyGraphForTokenIds(const std::vector<Id>& tokenId
m_dummyNodes = dummyNodes;
m_graph = graph;
m_useBezierEdges = false;
}
void GraphController::createDummyGraphForTokenIdsAndSetActiveAndVisibility(
@@ -1555,13 +1564,7 @@ void GraphController::buildGraph(
params.animatedTransition = animatedTransition;
params.scrollToTop = scrollToTop;
params.isIndexedList = scrollToTop;
params.bezierEdges = false;
MessageActivateTokens* msg = dynamic_cast<MessageActivateTokens*>(message);
if (msg && msg->isAggregation)
{
params.bezierEdges = true;
}
params.bezierEdges = m_useBezierEdges;
getView()->rebuildGraph(m_graph, m_dummyNodes, m_dummyEdges, params);
}