logic: fixed warnings, tests and bugs
* fixed clang warnings * fixed cxxparser tests * added missing checks for valid location in ASTVisitor callbacks for templates * removed warning when statusbar view is removed * made font of activated classes bold * fixed search box not responding to autocompletion tab or enter press * fixed search box not updated when active token changes
This commit is contained in:
@@ -356,6 +356,7 @@ GraphController::Margins GraphController::getMarginsForDummyNode(DummyNode& node
|
||||
case Node::NODE_CLASS:
|
||||
case Node::NODE_ENUM:
|
||||
case Node::NODE_TYPEDEF:
|
||||
case Node::NODE_TEMPLATE_PARAMETER_TYPE:
|
||||
if (node.subNodes.size())
|
||||
{
|
||||
margins.left = margins.right = 15;
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
#include "component/view/SearchView.h"
|
||||
#include "data/access/GraphAccess.h"
|
||||
#include "utility/messaging/type/MessageActivateTokens.h"
|
||||
|
||||
SearchController::SearchController(GraphAccess* graphAccess)
|
||||
: m_graphAccess(graphAccess)
|
||||
@@ -28,6 +27,15 @@ void SearchController::handleMessage(MessageActivateToken* message)
|
||||
m_ignoreNextMessageActivateToken = false;
|
||||
}
|
||||
|
||||
void SearchController::handleMessage(MessageActivateTokens* message)
|
||||
{
|
||||
if (message->tokenIds.size())
|
||||
{
|
||||
MessageActivateToken tokenMessage(message->tokenIds[0]);
|
||||
handleMessage(&tokenMessage);
|
||||
}
|
||||
}
|
||||
|
||||
void SearchController::handleMessage(MessageFind* message)
|
||||
{
|
||||
getView()->setFocus();
|
||||
@@ -47,14 +55,12 @@ void SearchController::handleMessage(MessageSearch* message)
|
||||
m_ignoreNextMessageActivateToken = true;
|
||||
|
||||
std::vector<Id> ids = m_graphAccess->getTokenIdsForQuery(query);
|
||||
if (ids.size())
|
||||
if (!ids.size())
|
||||
{
|
||||
MessageActivateTokens(ids).dispatch();
|
||||
return;
|
||||
ids.push_back(m_graphAccess->getIdForNodeWithName(query));
|
||||
}
|
||||
|
||||
Id nodeId = m_graphAccess->getIdForNodeWithName(query);
|
||||
MessageActivateToken(nodeId).dispatch();
|
||||
MessageActivateTokens(ids).dispatch();
|
||||
}
|
||||
|
||||
void SearchController::handleMessage(MessageSearchAutocomplete* message)
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
#include "component/controller/Controller.h"
|
||||
#include "utility/messaging/MessageListener.h"
|
||||
#include "utility/messaging/type/MessageActivateToken.h"
|
||||
#include "utility/messaging/type/MessageActivateTokens.h"
|
||||
#include "utility/messaging/type/MessageFind.h"
|
||||
#include "utility/messaging/type/MessageRefresh.h"
|
||||
#include "utility/messaging/type/MessageSearch.h"
|
||||
@@ -17,6 +18,7 @@ class SearchView;
|
||||
class SearchController
|
||||
: public Controller
|
||||
, public MessageListener<MessageActivateToken>
|
||||
, public MessageListener<MessageActivateTokens>
|
||||
, public MessageListener<MessageFind>
|
||||
, public MessageListener<MessageRefresh>
|
||||
, public MessageListener<MessageSearch>
|
||||
@@ -28,6 +30,7 @@ public:
|
||||
|
||||
private:
|
||||
virtual void handleMessage(MessageActivateToken* message);
|
||||
virtual void handleMessage(MessageActivateTokens* message);
|
||||
virtual void handleMessage(MessageFind* message);
|
||||
virtual void handleMessage(MessageRefresh* message);
|
||||
virtual void handleMessage(MessageSearch* message);
|
||||
|
||||
Reference in New Issue
Block a user