Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

[jalview.git] / src / jalview / gui / AnnotationColumnChooser.java

diff --git a/src/jalview/gui/AnnotationColumnChooser.java b/src/jalview/gui/AnnotationColumnChooser.java
index 5adecad..fbc93b5 100644 (file)
--- a/src/jalview/gui/AnnotationColumnChooser.java
+++ b/src/jalview/gui/AnnotationColumnChooser.java
@@ -25,6 +25,7 @@ import jalview.datamodel.HiddenColumns;
 import jalview.io.cache.JvCacheableInputBox;
 import jalview.schemes.AnnotationColourGradient;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 import jalview.viewmodel.annotationfilter.AnnotationFilterParameter;
 
 import java.awt.BorderLayout;
@@ -88,9 +89,8 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
   private HiddenColumns oldHiddenColumns;
 
-  protected int MIN_WIDTH = 420;
-
-  protected int MIN_HEIGHT = 430;
+  protected static int MIN_WIDTH = (Platform.isJS() ? 370 : 420);
+  protected static int MIN_HEIGHT = (Platform.isJS() ? 370 : 430);
 
   public AnnotationColumnChooser(AlignViewport av, final AlignmentPanel ap)
   {
@@ -99,8 +99,10 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
     frame.setContentPane(this);
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
     Desktop.addInternalFrame(frame,
-            MessageManager.getString("label.select_by_annotation"), 520,
-            215);
+            MessageManager.getString("label.select_by_annotation"), 0,
+            0);
+    // BH note: MIGLayout ignores this completely, 
+    // possibly creating a frame smaller than specified:
     frame.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
 
     addSliderChangeListener();
@@ -155,7 +157,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
             MessageManager.getString("label.threshold_filter")));
     thresholdPanel.setBackground(Color.white);
     thresholdPanel.setFont(JvSwingUtils.getLabelFont());
-    thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]"));
+    thresholdPanel.setLayout(new MigLayout("", "[left][right]", "[][]") );
 
     percentThreshold.setBackground(Color.white);
     percentThreshold.setFont(JvSwingUtils.getLabelFont());
@@ -204,7 +206,6 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
             AnnotationColumnChooser.NO_GRAPH_VIEW);
     switchableViewsPanel.add(graphFilterView,
             AnnotationColumnChooser.GRAPH_VIEW);
-
     this.setLayout(new BorderLayout());
     this.add(annotationComboBoxPanel, java.awt.BorderLayout.PAGE_START);
     this.add(switchableViewsPanel, java.awt.BorderLayout.CENTER);
@@ -496,7 +497,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
 
     CardLayout switchableViewsLayout = (CardLayout) switchableViewsPanel
             .getLayout();
-    switchableViewsLayout.show(switchableViewsPanel, currentView);
+       switchableViewsLayout.show(switchableViewsPanel, currentView);
     updateView();
   }
 
@@ -731,10 +732,9 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
               MessageManager.getString("label.search_filter")));
 
       searchBox.setPrototypeDisplayValue("XXXXXXXXXXXXXXXXXXXXXXX");
-      searchBox.setToolTipText(
+      searchBox.getComponent().setToolTipText(
               MessageManager.getString("info.enter_search_text_here"));
-      searchBox.getEditor().getEditorComponent()
-              .addKeyListener(new java.awt.event.KeyAdapter()
+      searchBox.addKeyListener(new java.awt.event.KeyAdapter()
               {
                 @Override
                 public void keyPressed(KeyEvent e)
@@ -746,8 +746,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
                   }
                 }
               });
-      searchBox.getEditor().getEditorComponent()
-              .addFocusListener(new FocusAdapter()
+      searchBox.addFocusListener(new FocusAdapter()
       {
         @Override
         public void focusLost(FocusEvent e)
@@ -777,7 +776,7 @@ public class AnnotationColumnChooser extends AnnotationRowFilter
       });
 
       syncState();
-      this.add(searchBox);
+      this.add(searchBox.getComponent());
       this.add(displayName);
       this.add(description);
     }