ui: fixed some ui related bugs

* aggregation edges only connect toplevel nodes
* fixed aggregation click for undo and redo
* don't show edge name in search field, because they are not searchable
* clear search field when clicking aggregation
* leave active nodes active when clicking edges
This commit is contained in:
Eberhard Graether
2015-08-03 16:33:29 +02:00
parent 165f32f6a6
commit f823d0ddb4
8 changed files with 59 additions and 36 deletions
@@ -14,27 +14,16 @@ SearchController::~SearchController()
void SearchController::handleMessage(MessageActivateEdge* message)
{
if (message->isIgnorable())
if (!message->isAggregation())
{
return;
}
SearchMatch match;
match.fullName = message->name;
match.nodeType = Node::NODE_CLASS;
match.tokenIds.insert(message->tokenId);
match.queryNodeType = QueryNode::QUERYNODETYPE_TOKEN;
getView()->setMatches(std::deque<SearchMatch>(1, match));
getView()->setMatches(std::deque<SearchMatch>());
}
void SearchController::handleMessage(MessageActivateFile* message)
{
if (message->isIgnorable())
{
return;
}
SearchMatch match;
match.fullName = message->filePath.fileName();
match.nodeType = Node::NODE_FILE;
@@ -46,11 +35,6 @@ void SearchController::handleMessage(MessageActivateFile* message)
void SearchController::handleMessage(MessageActivateNode* message)
{
if (message->isIgnorable())
{
return;
}
SearchMatch match;
match.fullName = message->name;
match.nodeType = message->type;
@@ -72,11 +56,6 @@ void SearchController::handleMessage(MessageFinishedParsing* message)
void SearchController::handleMessage(MessageSearch* message)
{
if (message->isIgnorable())
{
return;
}
getView()->setMatches(message->getMatches());
}