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

ui: Clicking an active location in the code view will activate it again

Browse Source
This commit is contained in:
Eberhard Graether
2018-01-28 21:58:10 +01:00
parent 28e4924f83
commit f49256bbd4
1 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtCodeField.cpp
+14 -28
View File
@@ -400,16 +400,10 @@ void QtCodeField::activateAnnotations(const std::vector<const Annotation*>& anno
std::set<Id> tokenIds; std::set<Id> tokenIds;
std::set<Id> localSymbolIds; std::set<Id> localSymbolIds;
bool allActive = true;
for (const Annotation* annotation : annotations) for (const Annotation* annotation : annotations)
{ {
if (annotation->locationType == LOCATION_TOKEN || annotation->locationType == LOCATION_QUALIFIER) if (annotation->locationType == LOCATION_TOKEN || annotation->locationType == LOCATION_QUALIFIER)
{ {
if (!annotation->isActive)
{
allActive = false;
}
if (annotation->locationId > 0) if (annotation->locationId > 0)
{ {
locationIds.push_back(annotation->locationId); locationIds.push_back(annotation->locationId);
@@ -422,11 +416,6 @@ void QtCodeField::activateAnnotations(const std::vector<const Annotation*>& anno
} }
else if (annotation->locationType == LOCATION_LOCAL_SYMBOL) else if (annotation->locationType == LOCATION_LOCAL_SYMBOL)
{ {
if (!annotation->isActive)
{
allActive = false;
}
if (annotation->tokenIds.size()) if (annotation->tokenIds.size())
{ {
localSymbolIds.insert(annotation->tokenIds.begin(), annotation->tokenIds.end()); localSymbolIds.insert(annotation->tokenIds.begin(), annotation->tokenIds.end());
@@ -434,24 +423,21 @@ void QtCodeField::activateAnnotations(const std::vector<const Annotation*>& anno
} }
} }
if (!allActive) if (tokenIds.size() > 1 || localSymbolIds.size() > 1 || (tokenIds.size() && localSymbolIds.size()))
{ {
if (tokenIds.size() > 1 || localSymbolIds.size() > 1 || (tokenIds.size() && localSymbolIds.size())) MessageTooltipShow(locationIds, utility::toVector(localSymbolIds), TOOLTIP_ORIGIN_CODE).dispatch();
{ }
MessageTooltipShow(locationIds, utility::toVector(localSymbolIds), TOOLTIP_ORIGIN_CODE).dispatch(); else if (locationIds.size())
} {
else if (locationIds.size()) MessageActivateSourceLocations(locationIds).dispatch();
{ }
MessageActivateSourceLocations(locationIds).dispatch(); else if (tokenIds.size()) // fallback for links in project description
} {
else if (tokenIds.size()) // fallback for links in project description MessageActivateTokenIds(utility::toVector(tokenIds)).dispatch();
{ }
MessageActivateTokenIds(utility::toVector(tokenIds)).dispatch(); else if (localSymbolIds.size())
} {
else if (localSymbolIds.size()) MessageActivateLocalSymbols(utility::toVector(localSymbolIds)).dispatch();
{
MessageActivateLocalSymbols(utility::toVector(localSymbolIds)).dispatch();
}
} }
} }