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
@@ -22,6 +22,11 @@ public:
return "MessageActivateEdge";
}
bool isAggregation() const
{
return type == Edge::EDGE_AGGREGATION;
}
const Id tokenId;
const Edge::EdgeType type;
const std::string name;
@@ -10,6 +10,7 @@ public:
MessageActivateTokens(const std::vector<Id>& tokenIds)
: tokenIds(tokenIds)
, isEdge(false)
, isAggregation(false)
, isFromSystem(false)
{
}
@@ -17,6 +18,7 @@ public:
MessageActivateTokens(Id tokenId)
: tokenIds(1, tokenId)
, isEdge(false)
, isAggregation(false)
, isFromSystem(false)
{
}
@@ -29,6 +31,7 @@ public:
const std::vector<Id> tokenIds;
bool isEdge;
bool isAggregation;
bool isFromSystem;
};
+1 -1
View File
@@ -31,7 +31,7 @@ namespace utility
template<typename T>
std::vector<T> utility::concat(const std::vector<T>& a, const std::vector<T>& b)
{
std::vector<T> r(a.size() + b.size());
std::vector<T> r;
append(r, a);
append(r, b);
return r;