X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=19308660c35cba64bff5f208b7385de29b89c619;hb=6636e89537d7f51f4a71e616d3bb0f612097d050;hp=5e09da79a02e66e6db05fec25a2b206e0c5c14dc;hpb=3402d066dbd7667cd805e6d78ac5eca66e237c72;p=jalview.git diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index 5e09da7..1930866 100755 --- a/src/jalview/appletgui/AlignmentPanel.java +++ b/src/jalview/appletgui/AlignmentPanel.java @@ -44,8 +44,13 @@ public class AlignmentPanel // this value is set false when selection area being dragged boolean fastPaint = true; + boolean MAC = false; + public AlignmentPanel(AlignFrame af, final AlignViewport av) { + if(System.getProperty("os.name").startsWith("Mac")) + MAC = true; + alignFrame = af; this.av = av; seqPanel = new SeqPanel(av, this); @@ -274,6 +279,7 @@ public class AlignmentPanel public void setWrapAlignment(boolean wrap) { + av.startSeq = 0; scalePanelHolder.setVisible(!wrap); hscroll.setVisible(!wrap); idwidthAdjuster.setVisible(!wrap); @@ -288,29 +294,6 @@ public class AlignmentPanel } - public void setColourScheme() - { - ColourSchemeI cs = av.getGlobalColourScheme(); - - if (av.getConservationSelected()) - { - - Alignment al = (Alignment) av.getAlignment(); - Conservation c = new Conservation("All", - ResidueProperties.propHash, 3, - al.getSequences(), 0, - al.getWidth()); - - c.calculate(); - c.verdict(false, av.ConsPercGaps); - ConservationColourScheme ccs = new ConservationColourScheme(c, cs); - - av.setGlobalColourScheme(ccs); - - } - - repaint(); - } int hextent = 0; int vextent = 0; @@ -452,7 +435,7 @@ public class AlignmentPanel overviewPanel.setBoxPosition(); } - if (av.getWrapAlignment() || !fastPaint) + if (av.getWrapAlignment() || !fastPaint || MAC) { repaint(); }