X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=9d0a55da93a501d6bc1eee4ecdd6632d8ab2baf2;hb=93aa4558431fabba858943e9b2e8f871381a691c;hp=28ad3c588b018e54a1ee2122077295c81b5ada90;hpb=d1192ef92ac9563bbc40a648f80e9b6d8162ed2b;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 28ad3c5..9d0a55d 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -86,7 +86,7 @@ public class OverviewPanel extends JPanel this.ap = alPanel; showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START, - true); + false); if (showHidden) { od = new OverviewDimensionsShowHidden(av.getRanges(), @@ -112,7 +112,7 @@ public class OverviewPanel extends JPanel // without this the overview window does not size to fit the overview canvas setPreferredSize(new Dimension(od.getWidth(), od.getHeight())); - + addComponentListener(new ComponentAdapter() { @Override @@ -170,22 +170,23 @@ public class OverviewPanel extends JPanel @Override public void mouseMoved(MouseEvent evt) { - if (!draggingBox) - // don't bother changing the cursor if we're dragging the box - // as we can't have moved inside or out of the box in that case + if (od.isPositionInBox(evt.getX(), evt.getY())) { - if (od.isPositionInBox(evt.getX(), evt.getY())) - { - // display drag cursor at mouse position - setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - } - else - { - // reset cursor - setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } + /* + * using HAND_CURSOR rather than DRAG_CURSOR + * as the latter is not supported on Mac + */ + getParent().setCursor( + Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + } + else + { + // reset cursor + getParent().setCursor( + Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR)); } } + }); addMouseListener(new MouseAdapter() @@ -208,9 +209,15 @@ public class OverviewPanel extends JPanel if (!od.isPositionInBox(evt.getX(), evt.getY())) { draggingBox = false; + + // display drag cursor at mouse position + setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + od.updateViewportFromMouse(evt.getX(), evt.getY(), av.getAlignment().getHiddenSequences(), av.getAlignment().getHiddenColumns()); + getParent().setCursor( + Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else { @@ -230,6 +237,13 @@ public class OverviewPanel extends JPanel showPopupMenu(evt); } } + + @Override + public void mouseReleased(MouseEvent evt) + { + draggingBox = false; + } + }); }