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
isAMac() -> isAMacAndNotJS(), isWindows() -> isWindowsAndNotJS()
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewPanel.java
diff --git
a/src/jalview/gui/OverviewPanel.java
b/src/jalview/gui/OverviewPanel.java
index
cfbc582
..
1785e70
100755
(executable)
--- a/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@
-55,24
+55,25
@@
import javax.swing.SwingUtilities;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
+@SuppressWarnings("serial")
public class OverviewPanel extends JPanel
implements Runnable, ViewportListenerI
{
public class OverviewPanel extends JPanel
implements Runnable, ViewportListenerI
{
- private OverviewDimensions od;
+ protected OverviewDimensions od;
private OverviewCanvas oviewCanvas;
private OverviewCanvas oviewCanvas;
- private AlignViewport av;
+ protected AlignViewport av;
private AlignmentPanel ap;
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.
/**
* Creates a new OverviewPanel object.
@@
-195,8
+196,9
@@
public class OverviewPanel extends JPanel
{
if (SwingUtilities.isRightMouseButton(evt))
{
{
if (SwingUtilities.isRightMouseButton(evt))
{
- if (!Platform.isAMac())
+ if (!Platform.isAMacAndNotJS())
{
{
+ // BH - MAC L&F here - forces popup and cancels any drag operation
showPopupMenu(evt);
}
}
showPopupMenu(evt);
}
}
@@
-255,7
+257,7
@@
public class OverviewPanel extends JPanel
/*
* Displays the popup menu and acts on user input
*/
/*
* 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()
{
JPopupMenu popup = new JPopupMenu();
ActionListener menuListener = new ActionListener()
@@
-280,7
+282,7
@@
public class OverviewPanel extends JPanel
/*
* Toggle overview display between showing hidden columns and hiding hidden columns
*/
/*
* Toggle overview display between showing hidden columns and hiding hidden columns
*/
- private void toggleHiddenColumns()
+ protected void toggleHiddenColumns()
{
if (showHidden)
{
{
if (showHidden)
{