canvas line/font/pixel fixes; menu accelerators;

[jalview.git] / src / jalview / jbgui / GAlignmentPanel.java

diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java
index 4a20adb..29a0cc0 100755 (executable)
--- a/src/jalview/jbgui/GAlignmentPanel.java
+++ b/src/jalview/jbgui/GAlignmentPanel.java
@@ -1,70 +1,84 @@
 /*
- * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.jbgui;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JScrollBar;
+import javax.swing.JScrollPane;
+import javax.swing.border.Border;
 
 public class GAlignmentPanel extends JPanel
 {
-  protected JPanel sequenceHolderPanel = new JPanel();
-
-  protected JScrollBar vscroll = new JScrollBar();
-
-  protected JScrollBar hscroll = new JScrollBar();
-
-  protected JPanel seqPanelHolder = new JPanel();
-
-  BorderLayout borderLayout1 = new BorderLayout();
+         protected JScrollBar vscroll = new JScrollBar();
 
-  BorderLayout borderLayout3 = new BorderLayout();
+         protected JScrollBar hscroll = new JScrollBar();
 
-  protected JPanel scalePanelHolder = new JPanel();
+         BorderLayout borderLayout1 = new BorderLayout();
 
-  protected JPanel idPanelHolder = new JPanel();
+         BorderLayout borderLayout3 = new BorderLayout();
 
-  BorderLayout borderLayout5 = new BorderLayout();
+         BorderLayout borderLayout5 = new BorderLayout();
 
-  protected JPanel idSpaceFillerPanel1 = new JPanel();
+         BorderLayout borderLayout6 = new BorderLayout();
 
-  public JPanel annotationSpaceFillerHolder = new JPanel();
+         ButtonGroup buttonGroup1 = new ButtonGroup();
 
-  BorderLayout borderLayout6 = new BorderLayout();
+         BorderLayout borderLayout7 = new BorderLayout();
 
-  ButtonGroup buttonGroup1 = new ButtonGroup();
+         BorderLayout borderLayout10 = new BorderLayout();
 
-  BorderLayout borderLayout7 = new BorderLayout();
+         BorderLayout borderLayout11 = new BorderLayout();
 
-  JPanel hscrollHolder = new JPanel();
+         public JScrollPane annotationScroller = new JScrollPane();
 
-  BorderLayout borderLayout10 = new BorderLayout();
+         Border border1;
 
-  protected JPanel hscrollFillerPanel = new JPanel();
+         BorderLayout borderLayout4 = new BorderLayout();
 
-  BorderLayout borderLayout11 = new BorderLayout();
+         
+         static JPanel newJPanel() {  // BH 2019
+                 JPanel p = new JPanel();
+                 // leaving this in, as it prevents 
+                 // the checkerboard business, despite how
+                 // funky that looks. Remove if you want to.
+                 p.setBackground(Color.white);
+                       return p;
+         }
 
-  public JScrollPane annotationScroller = new JScrollPane();
+  protected JPanel sequenceHolderPanel = newJPanel();
+  protected JPanel seqPanelHolder = newJPanel();
+  protected JPanel scalePanelHolder = newJPanel();
+  protected JPanel idPanelHolder = newJPanel();
+  protected JPanel idSpaceFillerPanel1 = newJPanel();
+  public JPanel annotationSpaceFillerHolder = newJPanel();
+  protected JPanel hscrollFillerPanel = newJPanel();
+  JPanel hscrollHolder = newJPanel();
 
-  Border border1;
 
-  BorderLayout borderLayout4 = new BorderLayout();
 
   public GAlignmentPanel()
   {
@@ -79,6 +93,8 @@ public class GAlignmentPanel extends JPanel
 
   private void jbInit() throws Exception
   {
+       //  annotationScroller.setBackground(Color.white);  // BH 2019
+         
     border1 = BorderFactory.createLineBorder(Color.gray, 1);
     idPanelHolder.setBorder(null);
     idPanelHolder.setPreferredSize(new Dimension(70, 10));