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

ui: Display scope name at bottom of snippet if available

Browse Source 
* Show scope name at bottom looking like top one
* Refactored CodeSnippetParams out of CodeView and use them everywhere
* Fixed border radius clipping problem at bottom of file by defining a small padding
* Scroll to line number when inserting a scope
This commit is contained in:
Eberhard Graether
2016-02-03 13:54:46 +01:00
parent e7224e0c46
commit b40e49b633
17 changed files with 296 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtCodeFileList.cpp
+18 -16
View File
@@ -33,7 +33,7 @@ QtCodeFileList::QtCodeFileList(QWidget* parent)
setWidget(m_frame.get());
connect(this->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(scrolled(int)));
connect(this, SIGNAL(shouldScrollToSnippet(QtCodeSnippet*)), this, SLOT(scrollToSnippet(QtCodeSnippet*)), Qt::QueuedConnection);
connect(this, SIGNAL(shouldScrollToSnippet(QtCodeSnippet*, uint)), this, SLOT(scrollToSnippet(QtCodeSnippet*, uint)), Qt::QueuedConnection);
}
QtCodeFileList::~QtCodeFileList()
@@ -46,27 +46,21 @@ QSize QtCodeFileList::sizeHint() const
}
void QtCodeFileList::addCodeSnippet(
uint startLineNumber,
const std::string& title,
Id titleId,
const std::string& code,
std::shared_ptr<TokenLocationFile> locationFile,
int refCount,
TimePoint modificationTime,
const CodeSnippetParams& params,
bool insert
){
QtCodeFile* file = getFile(locationFile->getFilePath());
QtCodeFile* file = getFile(params.locationFile->getFilePath());
if (insert)
{
QtCodeSnippet* snippet = file->insertCodeSnippet(startLineNumber, title, titleId, code, locationFile, refCount);
emit shouldScrollToSnippet(snippet);
QtCodeSnippet* snippet = file->insertCodeSnippet(params);
emit shouldScrollToSnippet(snippet, params.startLineNumber);
}
else
{
file->addCodeSnippet(startLineNumber, title, titleId, code, locationFile, refCount);
file->addCodeSnippet(params);
}
file->setModificationTime(modificationTime);
file->setModificationTime(params.modificationTime);
}
void QtCodeFileList::addFile(std::shared_ptr<TokenLocationFile> locationFile, int refCount, TimePoint modificationTime)
@@ -136,7 +130,7 @@ void QtCodeFileList::showFirstActiveSnippet(bool scrollTo)
if (scrollTo)
{
emit shouldScrollToSnippet(snippet);
emit shouldScrollToSnippet(snippet, 0);
}
}
@@ -207,9 +201,17 @@ void QtCodeFileList::scrolled(int value)
MessageScrollCode(value).dispatch();
}
void QtCodeFileList::scrollToSnippet(QtCodeSnippet* snippet)
void QtCodeFileList::scrollToSnippet(QtCodeSnippet* snippet, uint lineNumber)
{
this->ensureWidgetVisibleAnimated(snippet, snippet->getFirstActiveLineRect());
if (lineNumber == 0)
{
lineNumber = snippet->getFirstActiveLineNumber();
}
if (lineNumber)
{
this->ensureWidgetVisibleAnimated(snippet, snippet->getLineRectForLineNumber(lineNumber));
}
}
void QtCodeFileList::setValue()