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-2422 pull up refactoring in preparation for ChimeraX subclasses
[jalview.git]
/
src
/
jalview
/
gui
/
IdwidthAdjuster.java
diff --git
a/src/jalview/gui/IdwidthAdjuster.java
b/src/jalview/gui/IdwidthAdjuster.java
index
1c4ab57
..
0cffc3b
100755
(executable)
--- a/
src/jalview/gui/IdwidthAdjuster.java
+++ b/
src/jalview/gui/IdwidthAdjuster.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-23,8
+23,8
@@
package jalview.gui;
import jalview.api.AlignViewportI;
import java.awt.Color;
import jalview.api.AlignViewportI;
import java.awt.Color;
+import java.awt.Cursor;
import java.awt.Graphics;
import java.awt.Graphics;
-import java.awt.Image;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
@@
-37,15
+37,13
@@
import javax.swing.JPanel;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
-public class IdwidthAdjuster extends JPanel implements MouseListener,
- MouseMotionListener
+public class IdwidthAdjuster extends JPanel
+ implements MouseListener, MouseMotionListener
{
boolean active = false;
int oldX = 0;
{
boolean active = false;
int oldX = 0;
- Image image;
-
AlignmentPanel ap;
/**
AlignmentPanel ap;
/**
@@
-57,14
+55,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
public IdwidthAdjuster(AlignmentPanel ap)
{
this.ap = ap;
public IdwidthAdjuster(AlignmentPanel ap)
{
this.ap = ap;
-
- java.net.URL url = getClass().getResource("/images/idwidth.gif");
-
- if (url != null)
- {
- image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
- }
-
+ setBackground(Color.white);
addMouseListener(this);
addMouseMotionListener(this);
}
addMouseListener(this);
addMouseMotionListener(this);
}
@@
-75,6
+66,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mousePressed(MouseEvent evt)
{
oldX = evt.getX();
public void mousePressed(MouseEvent evt)
{
oldX = evt.getX();
@@
-86,6
+78,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseReleased(MouseEvent evt)
{
active = false;
public void mouseReleased(MouseEvent evt)
{
active = false;
@@
-112,6
+105,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseEntered(MouseEvent evt)
{
active = true;
public void mouseEntered(MouseEvent evt)
{
active = true;
@@
-124,6
+118,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseExited(MouseEvent evt)
{
active = false;
public void mouseExited(MouseEvent evt)
{
active = false;
@@
-136,6
+131,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseDragged(MouseEvent evt)
{
active = true;
public void mouseDragged(MouseEvent evt)
{
active = true;
@@
-149,7
+145,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
{
viewport.setIdWidth(newWidth);
{
viewport.setIdWidth(newWidth);
- ap.paintAlignment(true);
+ ap.paintAlignment(true, false);
}
oldX = evt.getX();
}
oldX = evt.getX();
@@
-161,6
+157,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseMoved(MouseEvent evt)
{
}
public void mouseMoved(MouseEvent evt)
{
}
@@
-171,6
+168,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
public void mouseClicked(MouseEvent evt)
{
}
@@
-181,6
+179,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param g
* DOCUMENT ME!
*/
* @param g
* DOCUMENT ME!
*/
+ @Override
public void paintComponent(Graphics g)
{
g.setColor(Color.white);
public void paintComponent(Graphics g)
{
g.setColor(Color.white);
@@
-188,10
+187,7
@@
public class IdwidthAdjuster extends JPanel implements MouseListener,
if (active)
{
if (active)
{
- if (image != null)
- {
- g.drawImage(image, getWidth() - 20, 2, this);
- }
+ setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
}
}
}
}
}
}