mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1-dragonmacher-empty-listing-drag-bug'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-05-29 13:12:04 -04:00
parent 3bf879a112 eccc052229
commit bd495e9ae7
1 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Ghidra/Framework/Docking/src/main/java/docking/widgets/fieldpanel/FieldPanel.java
View File

@@ -1905,35 +1905,49 @@ public class FieldPanel extends JPanel
}
void mouseDragged(MouseEvent e) {
if ((e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) == 0) {
return;
}
BigInteger n = model.getNumIndexes();
if (n == BigInteger.ZERO) {
return; // empty display
}
int x = e.getX();
int y = e.getY();
if (((Math.abs(x - mouseDownX) > 3) || (Math.abs(y - mouseDownY) > 3))) {
didDrag = true;
if (selectionHandler.isInProgress()) {
if (y < 0 || y >= getHeight()) {
timerScrollAmount = y < 0 ? y : y - getHeight();
scrollTimer.start();
}
else {
scrollTimer.stop();
cursorHandler.setCursorPos(x, y, null); // null means don't notify listeners
FieldLocation selectionEnd = cursorPosition;
// if the mouse is to the right of the last field, make the selection
// include the last field
Layout layout = getLayoutModel().getLayout(selectionEnd.getIndex());
int width = layout.getWidth();
if (x > width) {
selectionEnd =
new FieldLocation(selectionEnd.getIndex().add(BigInteger.ONE));
}
selectionHandler.updateSelectionSequence(selectionEnd);
repaint();
}
}
boolean draggedEnough = Math.abs(x - mouseDownX) > 3 || Math.abs(y - mouseDownY) > 3;
if (!draggedEnough) {
return;
}
didDrag = true;
if (!selectionHandler.isInProgress()) {
return;
}
if (y < 0 || y >= getHeight()) {
// mouse if off the screen; initiate scrolling
timerScrollAmount = y < 0 ? y : y - getHeight();
scrollTimer.start();
return;
}
// the drag is being used to update the selection
scrollTimer.stop();
cursorHandler.setCursorPos(x, y, null); // null means don't notify listeners
// if the mouse is to the right of the last field, include the last field
FieldLocation selectionEnd = cursorPosition;
BigInteger endIndex = selectionEnd.getIndex();
Layout layout = model.getLayout(endIndex);
int width = layout.getWidth();
if (x > width) {
selectionEnd = new FieldLocation(endIndex.add(BigInteger.ONE));
}
selectionHandler.updateSelectionSequence(selectionEnd);
repaint();
}
void mouseReleased(MouseEvent e) {