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

logic: Fixed qualifier locations not used in reference navigation and only highlighted on hovering

Browse Source
This commit is contained in:
Eberhard Graether
2019-02-04 02:04:38 +01:00
parent 463d3ebd4c
commit 92c8c282f5
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/data/storage/PersistentStorage.cpp
+2 -2
View File
@@ -1365,7 +1365,7 @@ std::shared_ptr<SourceLocationCollection> PersistentStorage::getSourceLocationsF
for (const StorageSourceLocation& sourceLocation: m_sqliteIndexStorage.getAllByIds<StorageSourceLocation>(locationIds)) for (const StorageSourceLocation& sourceLocation: m_sqliteIndexStorage.getAllByIds<StorageSourceLocation>(locationIds))
{ {
const LocationType type = intToLocationType(sourceLocation.type); const LocationType type = intToLocationType(sourceLocation.type);
if (type != LOCATION_TOKEN && type != LOCATION_SCOPE && type != LOCATION_QUALIFIER && type != LOCATION_LOCAL_SYMBOL) if (type != LOCATION_TOKEN && type != LOCATION_SCOPE && type != LOCATION_LOCAL_SYMBOL)
{ {
continue; continue;
} }
@@ -1429,7 +1429,7 @@ std::shared_ptr<SourceLocationCollection> PersistentStorage::getSourceLocationsF
} }
const LocationType type = intToLocationType(location.type); const LocationType type = intToLocationType(location.type);
if (type != LOCATION_TOKEN && type != LOCATION_SCOPE && type != LOCATION_QUALIFIER && type != LOCATION_LOCAL_SYMBOL) if (type != LOCATION_TOKEN && type != LOCATION_SCOPE && type != LOCATION_LOCAL_SYMBOL)
{ {
continue; continue;
} }
src/lib_gui/qt/element/QtCodeField.cpp
+15
View File
@@ -337,7 +337,22 @@ bool QtCodeField::annotateText(
if (annotation.locationType == LOCATION_QUALIFIER) if (annotation.locationType == LOCATION_QUALIFIER)
{ {
// never show qualifier locations active
annotation.isActive = false; annotation.isActive = false;
// only show qualifiers focused when mouse over
if (annotation.isFocused)
{
bool isHovered = false;
for (const Annotation* a : m_hoveredAnnotations)
{
if (&annotation == a)
{
isHovered = true;
}
}
annotation.isFocused = isHovered;
}
} }
if (wasFocused != annotation.isFocused || wasActive != annotation.isActive) if (wasFocused != annotation.isFocused || wasActive != annotation.isActive)
src/lib_gui/qt/element/QtCodeNavigator.cpp
+2 -1
View File
@@ -230,7 +230,8 @@ void QtCodeNavigator::addFile(std::shared_ptr<SourceLocationFile> locationFile,
locationFile->forEachStartSourceLocation( locationFile->forEachStartSourceLocation(
[&](SourceLocation* location) [&](SourceLocation* location)
{ {
if (location->isScopeLocation() || location->getType() == LOCATION_SIGNATURE || location->getType() == LOCATION_COMMENT) if (location->isScopeLocation() || location->getType() == LOCATION_SIGNATURE ||
location->getType() == LOCATION_COMMENT || location->getType() == LOCATION_QUALIFIER)
{ {
return; return;
} }