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
Multiple views, alignpanels not being used
[jalview.git]
/
src
/
jalview
/
gui
/
ScalePanel.java
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
07be3d0
..
8f32d8c
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-43,6
+43,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
boolean stretchingGroup = false;
\r
int min; //used by mouseDragged to see if user
\r
int max; //used by mouseDragged to see if user
\r
boolean stretchingGroup = false;
\r
int min; //used by mouseDragged to see if user
\r
int max; //used by mouseDragged to see if user
\r
+ boolean mouseDragging = false;
\r
\r
// wants to delete columns
\r
public ScalePanel(AlignViewport av, AlignmentPanel ap)
\r
\r
// wants to delete columns
\r
public ScalePanel(AlignViewport av, AlignmentPanel ap)
\r
@@
-72,7
+73,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
min = res;
\r
max = res;
\r
\r
min = res;
\r
max = res;
\r
\r
- if(reveal != null && SwingUtilities.isRightMouseButton(evt))
\r
+ /* if(reveal != null && SwingUtilities.isRightMouseButton(evt))
\r
{
\r
JPopupMenu pop = new JPopupMenu();
\r
JMenuItem item = new JMenuItem("Reveal");
\r
{
\r
JPopupMenu pop = new JPopupMenu();
\r
JMenuItem item = new JMenuItem("Reveal");
\r
@@
-109,9
+110,10
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
pop.show(this, evt.getX(), evt.getY());
\r
\r
}
\r
pop.show(this, evt.getX(), evt.getY());
\r
\r
}
\r
- else if (av.getColumnSelection().contains(res))
\r
+ else*/
\r
+ if (av.getColumnSelection().contains(res))
\r
{
\r
{
\r
- if( SwingUtilities.isRightMouseButton(evt))
\r
+ /* if( SwingUtilities.isRightMouseButton(evt))
\r
{
\r
JPopupMenu pop = new JPopupMenu();
\r
JMenuItem item = new JMenuItem("Hide Columns");
\r
{
\r
JPopupMenu pop = new JPopupMenu();
\r
JMenuItem item = new JMenuItem("Hide Columns");
\r
@@
-129,7
+131,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
pop.show(this, evt.getX(), evt.getY());
\r
\r
}
\r
pop.show(this, evt.getX(), evt.getY());
\r
\r
}
\r
- else
\r
+ else*/
\r
{
\r
av.getColumnSelection().removeElement(res);
\r
av.setSelectionGroup(null);
\r
{
\r
av.getColumnSelection().removeElement(res);
\r
av.setSelectionGroup(null);
\r
@@
-161,6
+163,8
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
*/
\r
public void mouseReleased(MouseEvent evt)
\r
{
\r
*/
\r
public void mouseReleased(MouseEvent evt)
\r
{
\r
+ mouseDragging = false;
\r
+
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
if(av.hasHiddenColumns)
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
if(av.hasHiddenColumns)
\r
@@
-195,6
+199,8
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
*/
\r
public void mouseDragged(MouseEvent evt)
\r
{
\r
*/
\r
public void mouseDragged(MouseEvent evt)
\r
{
\r
+ mouseDragging = true;
\r
+
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
if(av.hasHiddenColumns)
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
\r
\r
if(av.hasHiddenColumns)
\r
@@
-210,6
+216,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
max = res;
\r
}
\r
\r
max = res;
\r
}
\r
\r
+
\r
SequenceGroup sg = av.getSelectionGroup();
\r
\r
if (sg != null)
\r
SequenceGroup sg = av.getSelectionGroup();
\r
\r
if (sg != null)
\r
@@
-225,7
+232,7
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
{
\r
sg.setEndRes(res);
\r
}
\r
{
\r
sg.setEndRes(res);
\r
}
\r
- else if (res < sg.getStartRes())
\r
+ if (res < sg.getStartRes())
\r
{
\r
sg.setStartRes(res);
\r
}
\r
{
\r
sg.setStartRes(res);
\r
}
\r
@@
-246,8
+253,18
@@
public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
}
\r
}
\r
\r
}
\r
}
\r
\r
- public void mouseEntered(MouseEvent evt){}
\r
- public void mouseExited(MouseEvent evt){}
\r
+ public void mouseEntered(MouseEvent evt)
\r
+ {
\r
+ if(mouseDragging)
\r
+ ap.seqPanel.scrollCanvas(null);
\r
+ }
\r
+
\r
+ public void mouseExited(MouseEvent evt)
\r
+ {
\r
+ if(mouseDragging)
\r
+ ap.seqPanel.scrollCanvas(evt);
\r
+ }
\r
+
\r
public void mouseClicked(MouseEvent evt){}
\r
\r
public void mouseMoved(MouseEvent evt)
\r
public void mouseClicked(MouseEvent evt){}
\r
\r
public void mouseMoved(MouseEvent evt)
\r