From: jprocter <Jim Procter>
Date: Wed, 28 Apr 2010 14:23:18 +0000 (+0000)
Subject: jog pixels for OSX
X-Git-Tag: Release_2_5~27
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=a928b501e71cef2627004a73e2d5c460b44b2d7b

jog pixels for OSX
---

diff --git a/src/jalview/gui/FeatureColourChooser.java b/src/jalview/gui/FeatureColourChooser.java
index 1898113..3b39c2c 100644
--- a/src/jalview/gui/FeatureColourChooser.java
+++ b/src/jalview/gui/FeatureColourChooser.java
@@ -351,6 +351,7 @@ public class FeatureColourChooser extends JPanel
     if (col != null)
     {
       minColour.setBackground(col);
+      minColour.setForeground(col);
     }
     minColour.repaint();
     changeColour();
@@ -363,6 +364,7 @@ public class FeatureColourChooser extends JPanel
     if (col != null)
     {
       maxColour.setBackground(col);
+      maxColour.setForeground(col);
     }
     maxColour.repaint();
     changeColour();
@@ -453,12 +455,17 @@ public class FeatureColourChooser extends JPanel
       maxColour.setEnabled(false);
       minColour.setEnabled(false);
       maxColour.setBackground(this.getBackground());
+      maxColour.setForeground(this.getBackground());
       minColour.setBackground(this.getBackground());
+      minColour.setForeground(this.getBackground());
+      
     } else {
       maxColour.setEnabled(true);
       minColour.setEnabled(true);
       maxColour.setBackground(oldmaxColour);
       minColour.setBackground(oldminColour);
+      maxColour.setForeground(oldmaxColour);
+      minColour.setForeground(oldminColour);
     }
     fr.featureColours.put(type,acg);
     cs = acg;
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 98bf8b6..4192b48 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -358,6 +358,7 @@ public class GPreferences extends JPanel
         showunconserved_actionPerformed(e);
       }
     });
+    /// TODO: fit these in to preferences panel!!!!!
     shareSelections.setFont(verdana11);
     shareSelections.setHorizontalAlignment(SwingConstants.RIGHT);
     shareSelections.setHorizontalTextPosition(SwingConstants.LEFT);
@@ -614,7 +615,7 @@ public class GPreferences extends JPanel
     visualTab.add(fontNameCB);
     visualTab.add(fontSizeCB);
     visualTab.add(fontStyleCB);
-    annsettingsPanel.setBounds(new Rectangle(173,39,300,62));
+    annsettingsPanel.setBounds(new Rectangle(173,37,300,62));
     annsettingsPanel.setLayout(new FlowLayout(FlowLayout.LEFT,0,0));
     annsettingsPanel.add(autoAnnotSettings1);
     annsettingsPanel.add(autoAnnotSettings2);