src: Fixes for release

* clear references count when clearing code view
* fixed scrolling to character in overview lists
* fixed aggregation activation shown in history menu
* fixed same snippet being added twice
* Sourcetrail [Trial] as window title
* fixed undoing trail expand will always reactivate symbol
This commit is contained in:
Eberhard Graether
2017-06-20 15:18:30 +02:00
parent 81b88df3a2
commit ad3169c3c0
6 changed files with 34 additions and 17 deletions
+1 -1
View File
@@ -378,7 +378,7 @@ void Application::updateTitle()
{
if (m_hasGUI)
{
std::string title = m_isInTrial ? "Sourcetrail Trial" : "Sourcetrail";
std::string title = m_isInTrial ? "Sourcetrail [Trial]" : "Sourcetrail";
if (m_project)
{
@@ -268,9 +268,12 @@ void GraphController::handleMessage(MessageGraphNodeExpand* message)
if (m_graph && m_graph->getTrailMode() != Graph::TRAIL_NONE)
{
MessageActivateNodes msg;
msg.addNode(message->tokenId, m_storageAccess->getNameHierarchyForNodeId(message->tokenId));
msg.dispatch();
if (!message->isReplayed())
{
MessageActivateNodes msg;
msg.addNode(message->tokenId, m_storageAccess->getNameHierarchyForNodeId(message->tokenId));
msg.dispatch();
}
return;
}
@@ -548,6 +548,11 @@ void UndoRedoController::updateHistory()
index++;
SearchMatch match = getSearchMatchForMessage(it->message.get());
if (!match.text.size())
{
continue;
}
if (!firstActiveMessage)
{
firstActiveMessage = true;
@@ -567,20 +572,17 @@ void UndoRedoController::updateHistory()
}
}
if (match.text.size())
matches.push_back(match);
if (matches.size() > historySize)
{
matches.push_back(match);
matches.erase(matches.begin());
m_historyOffset++;
}
if (matches.size() > historySize)
{
matches.erase(matches.begin());
m_historyOffset++;
}
if (matches.size() == historySize && currentIndex != -1 && currentIndex - m_historyOffset != historySize - 1)
{
break;
}
if (matches.size() == historySize && currentIndex != -1 && currentIndex - m_historyOffset != historySize - 1)
{
break;
}
}
}
+10
View File
@@ -131,6 +131,16 @@ std::string QtCodeFile::getFileName() const
QtCodeSnippet* QtCodeFile::addCodeSnippet(const CodeSnippetParams& params)
{
for (std::shared_ptr<QtCodeSnippet> snippet : m_snippets)
{
if (snippet->getStartLineNumber() == params.startLineNumber &&
snippet->getEndLineNumber() == params.endLineNumber)
{
return snippet.get();
}
}
std::shared_ptr<QtCodeSnippet> snippet(new QtCodeSnippet(params, m_navigator, this));
if (params.reduced)
@@ -229,6 +229,8 @@ void QtCodeNavigator::clear()
{
clearCodeSnippets();
clearCaches();
updateRefLabel();
}
void QtCodeNavigator::clearCodeSnippets()
+1 -1
View File
@@ -327,7 +327,7 @@ void QtGraphView::pressedCharacterKey(QChar c)
Vec2i pos = node->getPosition();
Vec2i size = node->getSize();
view->ensureVisibleAnimated(QRectF(pos.x, pos.y, size.x, size.y + view->height() / 3 * 2), 100, 100);
view->ensureVisibleAnimated(QRectF(pos.x, pos.y, size.x, size.y + getViewSize().y / 3 * 2), 100, 100);
}
}