From 7fb89dadbc3eac97602fc84e519014582abe4649 Mon Sep 17 00:00:00 2001 From: hansonr Date: Tue, 15 Jan 2019 13:18:38 -0600 Subject: [PATCH] removal of AlignmentFrame lines --- src/jalview/gui/AlignFrame.java | 2 ++ src/jalview/gui/AlignmentPanel.java | 1 + src/jalview/gui/AnnotationLabels.java | 1 + src/jalview/gui/AnnotationPanel.java | 4 ++- src/jalview/gui/IdCanvas.java | 2 +- src/jalview/gui/ScalePanel.java | 2 +- src/jalview/gui/SeqCanvas.java | 2 +- src/jalview/jbgui/GAlignmentPanel.java | 54 +++++++++++++++++--------------- 8 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 340f9be..c1edeab 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -337,6 +337,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, */ void init() { + setBackground(Color.white); // BH 2019 + if (!Jalview.isHeadlessMode()) { progressBar = new ProgressBar(this.statusPanel, this.statusBar); diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index a120403..9ae5b8b 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -116,6 +116,7 @@ public class AlignmentPanel extends GAlignmentPanel implements */ public AlignmentPanel(AlignFrame af, final AlignViewport av) { + setBackground(Color.white); // BH 2019 alignFrame = af; this.av = av; setSeqPanel(new SeqPanel(av, this)); diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 6ea4c57..4062137 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -135,6 +135,7 @@ public class AnnotationLabels extends JPanel */ public AnnotationLabels(AlignmentPanel ap) { + this.ap = ap; av = ap.av; ToolTipManager.sharedInstance().registerComponent(this); diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 1fc5734..71b7eac 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -149,7 +149,9 @@ public class AnnotationPanel extends JPanel implements AwtRenderPanelI, */ public AnnotationPanel(AlignmentPanel ap) { - ToolTipManager.sharedInstance().registerComponent(this); + setBackground(Color.white); // BH 2019 + + ToolTipManager.sharedInstance().registerComponent(this); ToolTipManager.sharedInstance().setInitialDelay(0); ToolTipManager.sharedInstance().setDismissDelay(10000); this.ap = ap; diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index 5540c72..12f3971 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -220,7 +220,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI @Override public void paintComponent(Graphics g) { - super.paintComponent(g); + //super.paintComponent(g); // BH 2019 g.setColor(Color.white); g.fillRect(0, 0, getWidth(), getHeight()); diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index 8771119..5da14b3 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -415,7 +415,7 @@ public class ScalePanel extends JPanel @Override public void paintComponent(Graphics g) { - super.paintComponent(g); + //super.paintComponent(g); // BH 2019 /* * shouldn't get called in wrapped mode as the scale above is diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 6325e61..de136ae 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.java @@ -355,7 +355,7 @@ public class SeqCanvas extends JPanel implements ViewportListenerI @Override public void paintComponent(Graphics g) { - super.paintComponent(g); + //super.paintComponent(g); // BH 2019 int charHeight = av.getCharHeight(); int charWidth = av.getCharWidth(); diff --git a/src/jalview/jbgui/GAlignmentPanel.java b/src/jalview/jbgui/GAlignmentPanel.java index 6e09799..bf4f645 100755 --- a/src/jalview/jbgui/GAlignmentPanel.java +++ b/src/jalview/jbgui/GAlignmentPanel.java @@ -33,47 +33,49 @@ import javax.swing.border.Border; public class GAlignmentPanel extends JPanel { - protected JPanel sequenceHolderPanel = new JPanel(); + protected JScrollBar vscroll = new JScrollBar(); - protected JScrollBar vscroll = new JScrollBar(); + protected JScrollBar hscroll = new JScrollBar(); - protected JScrollBar hscroll = new JScrollBar(); + BorderLayout borderLayout1 = new BorderLayout(); - protected JPanel seqPanelHolder = new JPanel(); + BorderLayout borderLayout3 = new BorderLayout(); - BorderLayout borderLayout1 = new BorderLayout(); + BorderLayout borderLayout5 = new BorderLayout(); - BorderLayout borderLayout3 = new BorderLayout(); + BorderLayout borderLayout6 = new BorderLayout(); - protected JPanel scalePanelHolder = new JPanel(); + ButtonGroup buttonGroup1 = new ButtonGroup(); - protected JPanel idPanelHolder = new JPanel(); + BorderLayout borderLayout7 = new BorderLayout(); - BorderLayout borderLayout5 = new BorderLayout(); + BorderLayout borderLayout10 = new BorderLayout(); - protected JPanel idSpaceFillerPanel1 = new JPanel(); + BorderLayout borderLayout11 = new BorderLayout(); - public JPanel annotationSpaceFillerHolder = new JPanel(); + public JScrollPane annotationScroller = new JScrollPane(); - BorderLayout borderLayout6 = new BorderLayout(); + Border border1; - ButtonGroup buttonGroup1 = new ButtonGroup(); + BorderLayout borderLayout4 = new BorderLayout(); - BorderLayout borderLayout7 = new BorderLayout(); + + static JPanel newJPanel() { // BH 2019 + JPanel p = new JPanel(); + p.setBackground(Color.white); + return p; + } - JPanel hscrollHolder = new JPanel(); + 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(); - BorderLayout borderLayout10 = new BorderLayout(); - protected JPanel hscrollFillerPanel = new JPanel(); - - BorderLayout borderLayout11 = new BorderLayout(); - - public JScrollPane annotationScroller = new JScrollPane(); - - Border border1; - - BorderLayout borderLayout4 = new BorderLayout(); public GAlignmentPanel() { @@ -88,6 +90,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)); -- 1.7.10.2