X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;fp=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=a5aaf7c51c615b691686881eefbbf41ad73a388e;hb=4f30214e8098748469c6a4269ac2ed6c5750e4b0;hp=9d0a55da93a501d6bc1eee4ecdd6632d8ab2baf2;hpb=9dabc02511e3a334a5749a504f57f69d6c9017bd;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 9d0a55d..a5aaf7c 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -55,24 +55,25 @@ import javax.swing.SwingUtilities; * @author $author$ * @version $Revision$ */ +@SuppressWarnings("serial") public class OverviewPanel extends JPanel implements Runnable, ViewportListenerI { - private OverviewDimensions od; + protected OverviewDimensions od; private OverviewCanvas oviewCanvas; - private AlignViewport av; + protected AlignViewport av; private AlignmentPanel ap; - private JCheckBoxMenuItem displayToggle; + protected JCheckBoxMenuItem displayToggle; - private boolean showHidden = true; + protected boolean showHidden = true; - private boolean draggingBox = false; + protected boolean draggingBox = false; - private ProgressPanel progressPanel; + protected ProgressPanel progressPanel; /** * Creates a new OverviewPanel object. @@ -194,15 +195,14 @@ public class OverviewPanel extends JPanel @Override public void mousePressed(MouseEvent evt) { - if (SwingUtilities.isRightMouseButton(evt)) - { - if (!Platform.isAMac()) - { - showPopupMenu(evt); - } + + if (Platform.isWinRightButton(evt)) { + showPopupMenu(evt); + return; + } + if (SwingUtilities.isRightMouseButton(evt)) { + return; } - else - { // don't do anything if the mouse press is in the overview's box // (wait to see if it's a drag instead) // otherwise update the viewport @@ -226,7 +226,6 @@ public class OverviewPanel extends JPanel av.getAlignment().getHiddenSequences(), av.getAlignment().getHiddenColumns()); } - } } @Override @@ -245,12 +244,21 @@ public class OverviewPanel extends JPanel } }); + + /* + * Javascript does not call componentResized on initial display, + * so do the update here + */ + if (Platform.isJS()) + { + updateOverviewImage(); + } } /* * Displays the popup menu and acts on user input */ - private void showPopupMenu(MouseEvent e) + protected void showPopupMenu(MouseEvent e) { JPopupMenu popup = new JPopupMenu(); ActionListener menuListener = new ActionListener() @@ -275,7 +283,7 @@ public class OverviewPanel extends JPanel /* * Toggle overview display between showing hidden columns and hiding hidden columns */ - private void toggleHiddenColumns() + protected void toggleHiddenColumns() { if (showHidden) {