X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdwidthAdjuster.java;h=2c273ad07c3fceb94ed64a1e9e3d6ab109e8093f;hb=d488108227f80bedaf367d4e0376c4ea90382f6b;hp=c62ab9112f41ceae635005d5ef649bd363bd592b;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/gui/IdwidthAdjuster.java b/src/jalview/gui/IdwidthAdjuster.java
index c62ab91..2c273ad 100755
--- a/src/jalview/gui/IdwidthAdjuster.java
+++ b/src/jalview/gui/IdwidthAdjuster.java
@@ -1,26 +1,33 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import jalview.api.AlignViewportI;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPanel;
/**
* DOCUMENT ME!
@@ -28,145 +35,77 @@ import javax.swing.*;
* @author $author$
* @version $Revision$
*/
-public class IdwidthAdjuster extends JPanel implements MouseListener,
- MouseMotionListener
+@SuppressWarnings("serial")
+public class IdwidthAdjuster extends JPanel
{
- boolean active = false;
int oldX = 0;
- Image image;
-
- AlignmentPanel ap;
-
/**
- * Creates a new IdwidthAdjuster object.
+ * Creates a new IdwidthAdjuster object above the id panel that can be dragged
+ * to change the panel's width
*
* @param ap
- * DOCUMENT ME!
- */
- 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);
- }
-
- addMouseListener(this);
- addMouseMotionListener(this);
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param evt
- * DOCUMENT ME!
- */
- public void mousePressed(MouseEvent evt)
- {
- oldX = evt.getX();
- }
-
- /**
- * DOCUMENT ME!
+ * The associated AlignmentPanel
*
- * @param evt
- * DOCUMENT ME!
*/
- public void mouseReleased(MouseEvent evt)
- {
- active = false;
- repaint();
- }
-
- /**
- * DOCUMENT ME!
- *
- * @param evt
- * DOCUMENT ME!
- */
- public void mouseEntered(MouseEvent evt)
+ public IdwidthAdjuster(AlignmentPanel ap)
{
- active = true;
- repaint();
- }
+ // BH 2019.07.01 no need for overridden paintComponent, especially as it was
+ // overriding paint(g) so
+ // allowing strange component painting in its place.
- /**
- * DOCUMENT ME!
- *
- * @param evt
- * DOCUMENT ME!
- */
- public void mouseExited(MouseEvent evt)
- {
- active = false;
- repaint();
- }
+ setBackground(Color.white);
+ setOpaque(true);
- /**
- * DOCUMENT ME!
- *
- * @param evt
- * DOCUMENT ME!
- */
- public void mouseDragged(MouseEvent evt)
- {
- active = true;
+ setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
- Dimension d = ap.idPanel.idCanvas.getPreferredSize();
- int dif = evt.getX() - oldX;
+ // BH 2019.07.01 MouseAdapter is cleaner - no need for fields active or ap
- if (((d.width + dif) > 20) || (dif > 0))
+ MouseAdapter ma = (new MouseAdapter()
{
- ap.idPanel.idCanvas.setPreferredSize(new Dimension(d.width + dif,
- d.height));
- ap.paintAlignment(true);
- }
+ @Override
+ public void mousePressed(MouseEvent evt)
+ {
+ oldX = evt.getX();
+ }
- oldX = evt.getX();
- }
+ @Override
+ public void mouseDragged(MouseEvent evt)
+ {
+ AlignViewportI viewport = ap.getAlignViewport();
+ int curwidth = viewport.getIdWidth();
+ int dif = evt.getX() - oldX;
+ int newWidth = curwidth + dif;
+ if ((newWidth > 20) || (dif > 0))
+ {
+ viewport.setIdWidth(newWidth);
+ ap.paintAlignment(true, false);
+ }
+ oldX = evt.getX();
+ }
- /**
- * DOCUMENT ME!
- *
- * @param evt
- * DOCUMENT ME!
- */
- public void mouseMoved(MouseEvent evt)
- {
- }
+ @Override
+ public void mouseReleased(MouseEvent evt)
+ {
- /**
- * DOCUMENT ME!
- *
- * @param evt
- * DOCUMENT ME!
- */
- public void mouseClicked(MouseEvent evt)
- {
- }
+ // If in a SplitFrame with co-scaled alignments, set the other's id
+ // width to match
- /**
- * DOCUMENT ME!
- *
- * @param g
- * DOCUMENT ME!
- */
- public void paintComponent(Graphics g)
- {
- g.setColor(Color.white);
- g.fillRect(0, 0, getWidth(), getHeight());
+ AlignViewportI viewport = ap.getAlignViewport();
+ if (viewport.getCodingComplement() != null
+ && viewport.isScaleProteinAsCdna())
+ {
+ viewport.getCodingComplement().setIdWidth(viewport.getIdWidth());
+ SplitFrame sf = (SplitFrame) ap.alignFrame
+ .getSplitViewContainer();
+ sf.repaint();
+ }
- if (active)
- {
- if (image != null)
- {
- g.drawImage(image, getWidth() - 20, 2, this);
}
- }
+
+ });
+ addMouseListener(ma);
+ addMouseMotionListener(ma);
}
}