Merge pull request #79 from tferr/laf-fixes

Laf fixes

Author: ctrueden

src/main/java/org/scijava/ui/swing/console/ConsolePanel.java

@@ -132,12 +132,12 @@ private synchronized void initGui() {
 		textPanel.add(textPane);
 
 		scrollPane = new JScrollPane(textPanel);
-		scrollPane.setPreferredSize(new Dimension(600, 600));
 
 		// Make the scroll bars move at a reasonable pace.
-		final FontMetrics fm = scrollPane.getFontMetrics(scrollPane.getFont());
+		final FontMetrics fm = scrollPane.getFontMetrics(textPane.getFont());
 		final int charWidth = fm.charWidth('a');
 		final int lineHeight = fm.getHeight();
+		scrollPane.setPreferredSize(new Dimension(charWidth * 80, lineHeight * 10)); //80 columns, 10 lines
 		scrollPane.getHorizontalScrollBar().setUnitIncrement(charWidth);
 		scrollPane.getVerticalScrollBar().setUnitIncrement(2 * lineHeight);
 		textPane.setComponentPopupMenu(initMenu());

src/main/java/org/scijava/ui/swing/widget/SwingColorWidget.java

@@ -46,6 +46,7 @@
 import javax.swing.JColorChooser;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 import javax.swing.colorchooser.AbstractColorChooserPanel;
 
 import org.scijava.plugin.Plugin;
@@ -66,7 +67,7 @@ public class SwingColorWidget extends SwingInputWidget<ColorRGB> implements
 	ActionListener, ColorWidget<JPanel>
 {
 
-	private static final int SWATCH_WIDTH = 64, SWATCH_HEIGHT = 16;
+	private static final int SWATCH_WIDTH = 64, SWATCH_HEIGHT = widgetHeight();
 
 	private static final String HSB_CLASS_NAME =
 		"javax.swing.colorchooser.DefaultHSBChooserPanel";
@@ -211,6 +212,15 @@ private int value(final Object o) {
 		return chooser;
 	}
 
+	private static int widgetHeight() {
+		try {
+			return UIManager.getFont("TextField.font").getSize();
+		} catch (final Exception ignored) {
+			// do nothing
+		}
+		return 16;
+	}
+
 	// -- AbstractUIInputWidget methods ---
 
 	@Override