X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationChooser.java;h=233f2807365a3e010e1001b080acbb5eb3261915;hb=11fbdf6f34deffb5b179e23ffc3ca50dcae296dc;hp=84883d7266fa3e1376f995bde2f7527d4868a8bc;hpb=106a3890f956e2aa7780b2985f4326655912a558;p=jalview.git diff --git a/src/jalview/gui/AnnotationChooser.java b/src/jalview/gui/AnnotationChooser.java index 84883d7..233f280 100644 --- a/src/jalview/gui/AnnotationChooser.java +++ b/src/jalview/gui/AnnotationChooser.java @@ -195,14 +195,7 @@ public class AnnotationChooser extends JPanel { setAnnotationVisibility(true); - // copied from AnnotationLabel.actionPerformed (after show/hide row)... - // TODO should drive this functionality into AlignmentPanel ap.updateAnnotation(); - // this.ap.annotationPanel.adjustPanelHeight(); - // this.ap.alabels.setSize(this.ap.alabels.getSize().width, - // this.ap.annotationPanel.getSize().height); - // this.ap.validate(); - this.ap.paintAlignment(true, false); } /** @@ -229,11 +222,6 @@ public class AnnotationChooser extends JPanel } } ap.updateAnnotation(); - // // this.ap.annotationPanel.adjustPanelHeight(); - // this.ap.alabels.setSize(this.ap.alabels.getSize().width, - // this.ap.annotationPanel.getSize().height); - // this.ap.validate(); - this.ap.paintAlignment(true, false); } /** @@ -249,9 +237,7 @@ public class AnnotationChooser extends JPanel { setAnnotationVisibility(false); - this.ap.updateAnnotation(); - // this.ap.annotationPanel.adjustPanelHeight(); - this.ap.paintAlignment(true, false); + ap.updateAnnotation(); } /** @@ -619,8 +605,8 @@ public class AnnotationChooser extends JPanel frame.setContentPane(this); frame.setLayer(JLayeredPane.PALETTE_LAYER); Desktop.addInternalFrame(frame, - MessageManager.getString("label.choose_annotations"), - MY_FRAME_WIDTH, MY_FRAME_HEIGHT, true); + MessageManager.getString("label.choose_annotations"), Desktop.FRAME_MAKE_VISIBLE, + MY_FRAME_WIDTH, MY_FRAME_HEIGHT, Desktop.FRAME_ALLOW_RESIZE, Desktop.FRAME_SET_MIN_SIZE_300); } protected void setShowSelected(boolean showSelected)