git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2611 Still not happy with behaviour
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewPanel.java
diff --git
a/src/jalview/gui/OverviewPanel.java
b/src/jalview/gui/OverviewPanel.java
index
35a3148
..
5fbefb5
100755
(executable)
--- a/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@
-28,6
+28,7
@@
import jalview.viewmodel.OverviewDimensionsShowHidden;
import jalview.viewmodel.ViewportListenerI;
import java.awt.BorderLayout;
import jalview.viewmodel.ViewportListenerI;
import java.awt.BorderLayout;
+import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@
-65,6
+66,8
@@
public class OverviewPanel extends JPanel implements Runnable,
private boolean showHidden = true;
private boolean showHidden = true;
+ private boolean draggingBox = false;
+
/**
* Creates a new OverviewPanel object.
*
/**
* Creates a new OverviewPanel object.
*
@@
-110,9
+113,18
@@
public class OverviewPanel extends JPanel implements Runnable,
if (!SwingUtilities.isRightMouseButton(evt)
&& !av.getWrapAlignment())
{
if (!SwingUtilities.isRightMouseButton(evt)
&& !av.getWrapAlignment())
{
- od.updateViewportFromMouse(evt.getX(), evt.getY(), av
+ if (draggingBox)
+ {
+ od.adjustViewportFromMouse(evt.getX(),
+ evt.getY(), av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ else
+ {
+ od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
.getHiddenColumns());
.getAlignment().getHiddenSequences(), av.getAlignment()
.getHiddenColumns());
+ }
}
}
}
}
@@
-123,12
+135,12
@@
public class OverviewPanel extends JPanel implements Runnable,
if (od.isPositionInBox(evt.getX(), evt.getY()))
{
// display drag cursor at mouse position
if (od.isPositionInBox(evt.getX(), evt.getY()))
{
// display drag cursor at mouse position
-
+ setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
}
else
{
// reset cursor
}
else
{
// reset cursor
-
+ setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
}
});
}
}
});
@@
-156,6
+168,22
@@
public class OverviewPanel extends JPanel implements Runnable,
av.getAlignment().getHiddenSequences(),
av.getAlignment().getHiddenColumns());
}
av.getAlignment().getHiddenSequences(),
av.getAlignment().getHiddenColumns());
}
+ else
+ {
+ draggingBox = true;
+ od.setDragPoint(evt.getX(), evt.getY(),
+ av.getAlignment().getHiddenSequences(),
+ av.getAlignment().getHiddenColumns());
+ }
+ }
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent evt)
+ {
+ if (draggingBox)
+ {
+ draggingBox = false;
}
}
}
}