X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=0c0bf3740706911852f4604cc5a898658be025dd;hb=refs%2Fheads%2Fbug%2FJAL-2621;hp=334310f86da7820d1bdd4b66f8bbbfd0bf24ceb8;hpb=bf2340eaba3b7974bc06df4fdada3de7cb596b68;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index 334310f..0c0bf37 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -32,11 +32,8 @@ import java.awt.CheckboxMenuItem; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Frame; -import java.awt.Image; import java.awt.Panel; -import java.awt.Point; import java.awt.PopupMenu; -import java.awt.Toolkit; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.InputEvent; @@ -47,14 +44,9 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.beans.PropertyChangeEvent; -import javax.swing.ImageIcon; - public class OverviewPanel extends Panel implements Runnable, MouseMotionListener, MouseListener, ViewportListenerI { - protected Image dragImage = new ImageIcon( - getClass().getResource("/images/dragcursor.png")).getImage(); - private OverviewDimensions od; private OverviewCanvas oviewCanvas; @@ -69,8 +61,6 @@ public class OverviewPanel extends Panel implements Runnable, private boolean draggingBox = false; - private Cursor dragCursor; - public OverviewPanel(AlignmentPanel alPanel) { this.av = alPanel.av; @@ -89,19 +79,6 @@ public class OverviewPanel extends Panel implements Runnable, av.getRanges().addPropertyChangeListener(this); - Toolkit toolkit = Toolkit.getDefaultToolkit(); - Image image = toolkit.getImage("images/dragcursor.png"); - - if (Platform.isAMac()) - { - dragCursor = toolkit.createCustomCursor(image, new Point(15, 15), - "drag cursor"); - } - else - { - dragCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR); - } - addComponentListener(new ComponentAdapter() { @@ -142,33 +119,21 @@ public class OverviewPanel extends Panel implements Runnable, { showPopupMenu(evt); } - else if (od.isPositionInBox(evt.getX(), evt.getY())) - { - // display drag cursor at mouse position - this.getParent().setCursor(dragCursor); - } - else - { - // reset cursor - this.getParent() - .setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } } @Override public void mouseMoved(MouseEvent evt) { - System.out.println(evt.getY()); if (od.isPositionInBox(evt.getX(), evt.getY())) { - // display drag cursor at mouse position - this.getParent().setCursor(dragCursor); + this.getParent() + .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else { - // reset cursor this.getParent() - .setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + .setCursor( + Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); } } @@ -194,6 +159,8 @@ public class OverviewPanel extends Panel implements Runnable, od.updateViewportFromMouse(evt.getX(), evt.getY(), av.getAlignment().getHiddenSequences(), av.getAlignment().getHiddenColumns()); + getParent() + .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else {