From 89264d97bb2e53fe3b4803096696f8f0fee1d435 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Fri, 8 Jul 2016 12:27:47 +0200 Subject: [PATCH] in code view --- src/lib/component/controller/CodeController.cpp | 15 +++++++++++---- src/lib/component/controller/CodeController.h | 2 -- src/lib_gui/qt/view/QtCodeView.cpp | 8 ++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp index a5a5f46b..7fdd0b71 100644 --- a/src/lib/component/controller/CodeController.cpp +++ b/src/lib/component/controller/CodeController.cpp @@ -25,12 +25,13 @@ CodeController::~CodeController() { } -const uint CodeController::s_lineRadius = 2; - void CodeController::handleMessage(MessageActivateAll* message) { TRACE("code all"); + CodeView* view = getView(); + view->showOverlay(); + std::vector errors; m_collection = m_storageAccess->getErrorTokenLocations(&errors); std::vector snippets = getSnippetsForCollection(m_collection); @@ -82,7 +83,6 @@ void CodeController::handleMessage(MessageActivateAll* message) snippets.insert(snippets.begin(), statsSnippet); - CodeView* view = getView(); view->clear(); view->setErrorInfos(errors); view->showCodeSnippets(snippets, std::vector()); @@ -101,6 +101,7 @@ void CodeController::handleMessage(MessageActivateTokens* message) TRACE("code activate"); CodeView* view = getView(); + view->showOverlay(); if (!message->keepContent()) { @@ -168,6 +169,7 @@ void CodeController::handleMessage(MessageChangeFileView* message) case MessageChangeFileView::FILE_SNIPPETS: if (message->needsData) { + view->showOverlay(); view->addCodeSnippets(getSnippetsForFile( m_collection->getTokenLocationFileByPath(message->filePath), !message->showErrors), false); } @@ -177,6 +179,8 @@ void CodeController::handleMessage(MessageChangeFileView* message) case MessageChangeFileView::FILE_MAXIMIZED: if (message->needsData) { + view->showOverlay(); + CodeSnippetParams params; params.startLineNumber = 1; params.refCount = -1; @@ -246,11 +250,13 @@ void CodeController::handleMessage(MessageShowErrors* message) { TRACE("code errors"); + CodeView* view = getView(); + view->showOverlay(); + std::vector errors; m_collection = m_storageAccess->getErrorTokenLocations(&errors); std::vector snippets = getSnippetsForCollection(m_collection); - CodeView* view = getView(); view->clear(); view->setErrorInfos(errors); view->showCodeSnippets(snippets, std::vector()); @@ -263,6 +269,7 @@ void CodeController::handleMessage(MessageSearchFullText* message) TRACE("code fulltext"); CodeView* view = getView(); + view->showOverlay(); view->clear(); m_collection = m_storageAccess->getFullTextSearchLocations(message->searchTerm, message->caseSensitive); diff --git a/src/lib/component/controller/CodeController.h b/src/lib/component/controller/CodeController.h index 96ff7c58..750173fc 100644 --- a/src/lib/component/controller/CodeController.h +++ b/src/lib/component/controller/CodeController.h @@ -46,8 +46,6 @@ public: ~CodeController(); private: - static const uint s_lineRadius; - virtual void handleMessage(MessageActivateAll* message); virtual void handleMessage(MessageActivateLocalSymbols* message); virtual void handleMessage(MessageActivateTokens* message); diff --git a/src/lib_gui/qt/view/QtCodeView.cpp b/src/lib_gui/qt/view/QtCodeView.cpp index 7576c4d7..857af0bd 100644 --- a/src/lib_gui/qt/view/QtCodeView.cpp +++ b/src/lib_gui/qt/view/QtCodeView.cpp @@ -157,6 +157,8 @@ void QtCodeView::doShowCodeSnippets(const std::vector& snippe m_widget->updateFiles(); setStyleSheet(); // so property "isLast" of QtCodeSnippet is computed correctly + + hideOverlay(); } void QtCodeView::doAddCodeSnippets(const std::vector& snippets, bool insert) @@ -170,12 +172,16 @@ void QtCodeView::doAddCodeSnippets(const std::vector& snippet setStyleSheet(); // so property "isLast" of QtCodeSnippet is computed correctly + hideOverlay(); + m_widget->scrollToActiveFileIfRequested(); } void QtCodeView::doShowCodeFile(const CodeSnippetParams& params) { m_widget->addCodeSnippet(params); + + hideOverlay(); } void QtCodeView::doSetFileState(const FilePath filePath, FileState state) @@ -192,6 +198,8 @@ void QtCodeView::doSetFileState(const FilePath filePath, FileState state) m_widget->setFileMaximized(filePath); break; } + + hideOverlay(); } void QtCodeView::doShowFirstActiveSnippet(const std::vector& activeTokenIds, bool scrollTo)