yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse source
This commit is contained in:
ghidravore 2020-11-30 16:52:08 -05:00
commit b23c8ca435
11 changed files with 60 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/event/mouse/JungPickingGraphMousePlugin.java
View file

@ -257,16 +257,7 @@ public class JungPickingGraphMousePlugin<V, E> extends AbstractGraphMousePlugin
@SuppressWarnings("unchecked")
public void mouseReleased(MouseEvent e) {
VisualizationViewer<V, E> vv = (VisualizationViewer<V, E>) e.getSource();
if (e.getModifiersEx() == modifiers) {
if (down != null) {
Point2D out = e.getPoint();
if (vertex == null && heyThatsTooClose(down, out, 5) == false) {
pickContainedVertices(vv, down, out, true);
}
}
}
else if (e.getModifiersEx() == this.addToSelectionModifiers) {
if (e.getModifiersEx() == this.addToSelectionModifiers) {
if (down != null) {
Point2D out = e.getPoint();
@ -275,6 +266,19 @@ public class JungPickingGraphMousePlugin<V, E> extends AbstractGraphMousePlugin
}
}
}
else {
// Mouse released without the 'add to selection' modifiers. See if we have been dragging
if (down != null) {
// check to see if we were dragging (no vertex picked and a large enough rectangle)
Point2D out = e.getPoint();
if (vertex == null && heyThatsTooClose(down, out, 5) == false) {
pickContainedVertices(vv, down, out, true);
}
}
}
down = null;
vertex = null;
edge = null;

3
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/event/mouse/VisualGraphPickingGraphMousePlugin.java
View file

@ -151,9 +151,6 @@ public class VisualGraphPickingGraphMousePlugin<V extends VisualVertex, E extend
@Override
public void mouseReleased(MouseEvent e) {
if (!checkModifiers(e)) {
return;
}
// We overrode this method here to clear the picked state of edges and vertices if we
// ever get a released event when the user is clicking somewhere that is not an edge or