in code view

This commit is contained in:
Eberhard Graether
2016-07-08 14:37:49 +02:00
parent 096291a6c4
commit 89264d97bb
3 changed files with 19 additions and 6 deletions
@@ -25,12 +25,13 @@ CodeController::~CodeController()
{ {
} }
const uint CodeController::s_lineRadius = 2;
void CodeController::handleMessage(MessageActivateAll* message) void CodeController::handleMessage(MessageActivateAll* message)
{ {
TRACE("code all"); TRACE("code all");
CodeView* view = getView();
view->showOverlay();
std::vector<ErrorInfo> errors; std::vector<ErrorInfo> errors;
m_collection = m_storageAccess->getErrorTokenLocations(&errors); m_collection = m_storageAccess->getErrorTokenLocations(&errors);
std::vector<CodeSnippetParams> snippets = getSnippetsForCollection(m_collection); std::vector<CodeSnippetParams> snippets = getSnippetsForCollection(m_collection);
@@ -82,7 +83,6 @@ void CodeController::handleMessage(MessageActivateAll* message)
snippets.insert(snippets.begin(), statsSnippet); snippets.insert(snippets.begin(), statsSnippet);
CodeView* view = getView();
view->clear(); view->clear();
view->setErrorInfos(errors); view->setErrorInfos(errors);
view->showCodeSnippets(snippets, std::vector<Id>()); view->showCodeSnippets(snippets, std::vector<Id>());
@@ -101,6 +101,7 @@ void CodeController::handleMessage(MessageActivateTokens* message)
TRACE("code activate"); TRACE("code activate");
CodeView* view = getView(); CodeView* view = getView();
view->showOverlay();
if (!message->keepContent()) if (!message->keepContent())
{ {
@@ -168,6 +169,7 @@ void CodeController::handleMessage(MessageChangeFileView* message)
case MessageChangeFileView::FILE_SNIPPETS: case MessageChangeFileView::FILE_SNIPPETS:
if (message->needsData) if (message->needsData)
{ {
view->showOverlay();
view->addCodeSnippets(getSnippetsForFile( view->addCodeSnippets(getSnippetsForFile(
m_collection->getTokenLocationFileByPath(message->filePath), !message->showErrors), false); m_collection->getTokenLocationFileByPath(message->filePath), !message->showErrors), false);
} }
@@ -177,6 +179,8 @@ void CodeController::handleMessage(MessageChangeFileView* message)
case MessageChangeFileView::FILE_MAXIMIZED: case MessageChangeFileView::FILE_MAXIMIZED:
if (message->needsData) if (message->needsData)
{ {
view->showOverlay();
CodeSnippetParams params; CodeSnippetParams params;
params.startLineNumber = 1; params.startLineNumber = 1;
params.refCount = -1; params.refCount = -1;
@@ -246,11 +250,13 @@ void CodeController::handleMessage(MessageShowErrors* message)
{ {
TRACE("code errors"); TRACE("code errors");
CodeView* view = getView();
view->showOverlay();
std::vector<ErrorInfo> errors; std::vector<ErrorInfo> errors;
m_collection = m_storageAccess->getErrorTokenLocations(&errors); m_collection = m_storageAccess->getErrorTokenLocations(&errors);
std::vector<CodeSnippetParams> snippets = getSnippetsForCollection(m_collection); std::vector<CodeSnippetParams> snippets = getSnippetsForCollection(m_collection);
CodeView* view = getView();
view->clear(); view->clear();
view->setErrorInfos(errors); view->setErrorInfos(errors);
view->showCodeSnippets(snippets, std::vector<Id>()); view->showCodeSnippets(snippets, std::vector<Id>());
@@ -263,6 +269,7 @@ void CodeController::handleMessage(MessageSearchFullText* message)
TRACE("code fulltext"); TRACE("code fulltext");
CodeView* view = getView(); CodeView* view = getView();
view->showOverlay();
view->clear(); view->clear();
m_collection = m_storageAccess->getFullTextSearchLocations(message->searchTerm, message->caseSensitive); m_collection = m_storageAccess->getFullTextSearchLocations(message->searchTerm, message->caseSensitive);
@@ -46,8 +46,6 @@ public:
~CodeController(); ~CodeController();
private: private:
static const uint s_lineRadius;
virtual void handleMessage(MessageActivateAll* message); virtual void handleMessage(MessageActivateAll* message);
virtual void handleMessage(MessageActivateLocalSymbols* message); virtual void handleMessage(MessageActivateLocalSymbols* message);
virtual void handleMessage(MessageActivateTokens* message); virtual void handleMessage(MessageActivateTokens* message);
+8
View File
@@ -157,6 +157,8 @@ void QtCodeView::doShowCodeSnippets(const std::vector<CodeSnippetParams>& snippe
m_widget->updateFiles(); m_widget->updateFiles();
setStyleSheet(); // so property "isLast" of QtCodeSnippet is computed correctly setStyleSheet(); // so property "isLast" of QtCodeSnippet is computed correctly
hideOverlay();
} }
void QtCodeView::doAddCodeSnippets(const std::vector<CodeSnippetParams>& snippets, bool insert) void QtCodeView::doAddCodeSnippets(const std::vector<CodeSnippetParams>& snippets, bool insert)
@@ -170,12 +172,16 @@ void QtCodeView::doAddCodeSnippets(const std::vector<CodeSnippetParams>& snippet
setStyleSheet(); // so property "isLast" of QtCodeSnippet is computed correctly setStyleSheet(); // so property "isLast" of QtCodeSnippet is computed correctly
hideOverlay();
m_widget->scrollToActiveFileIfRequested(); m_widget->scrollToActiveFileIfRequested();
} }
void QtCodeView::doShowCodeFile(const CodeSnippetParams& params) void QtCodeView::doShowCodeFile(const CodeSnippetParams& params)
{ {
m_widget->addCodeSnippet(params); m_widget->addCodeSnippet(params);
hideOverlay();
} }
void QtCodeView::doSetFileState(const FilePath filePath, FileState state) void QtCodeView::doSetFileState(const FilePath filePath, FileState state)
@@ -192,6 +198,8 @@ void QtCodeView::doSetFileState(const FilePath filePath, FileState state)
m_widget->setFileMaximized(filePath); m_widget->setFileMaximized(filePath);
break; break;
} }
hideOverlay();
} }
void QtCodeView::doShowFirstActiveSnippet(const std::vector<Id>& activeTokenIds, bool scrollTo) void QtCodeView::doShowFirstActiveSnippet(const std::vector<Id>& activeTokenIds, bool scrollTo)