Merge remote-tracking branch 'origin/patch'

This commit is contained in:
ghidra1 2020-12-14 13:01:12 -05:00
commit 998f1c651f
9 changed files with 53 additions and 27 deletions

View file

@ -666,6 +666,9 @@ public class DefaultGraphDisplay implements GraphDisplay {
satellite.getRenderContext().setVertexFillPaintFunction(Colors::getColor);
satellite.scaleToLayout();
satellite.getRenderContext().setVertexLabelFunction(n -> null);
// always get the current predicate from the main view and test with it,
satellite.getRenderContext()
.setVertexIncludePredicate(v -> viewer.getRenderContext().getVertexIncludePredicate().test(v));
satellite.getComponent().setBorder(BorderFactory.createEtchedBorder());
parentViewer.getComponent().addComponentListener(new ComponentAdapter() {
@Override
@ -873,7 +876,7 @@ public class DefaultGraphDisplay implements GraphDisplay {
viewer.getRenderContext()
.setVertexIncludePredicate(
v -> v.getAttributeMap().values().stream().noneMatch(selected::contains));
viewer.repaint();
});
edgeFilters = AttributeFilters.builder()