Fix issues with treeview and status bar on gnome3.

Change-Id: Ib4f7d4cd92109a5c7b8a994a5692d57a2ed9b10f
Reviewed-on: http://gerrit.dmdirc.com/2343
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -62,8 +62,10 @@ import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 
+import net.miginfocom.layout.PlatformDefaults;
 import lombok.Getter;
 import net.miginfocom.swing.MigLayout;
 
@@ -402,8 +404,11 @@ public final class MainFrame extends JFrame implements WindowListener,
      * Lays out the this component.
      */
     private void layoutComponents() {
+        final int height = getFontMetrics(UIManager.getFont("Table.font"))
+                .getHeight() + (int) PlatformDefaults.getUnitValueX("related")
+                .getValue();
         getContentPane().add(mainSplitPane, "grow, push");
-        getContentPane().add(statusBar, "hmax 20, wmax 100%-2*rel, "
+        getContentPane().add(statusBar, "hmax "+height+", wmax 100%-2*rel, "
                 + "wmin 100%-2*rel, south, gap rel rel 0 rel");
     }
 

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

@@ -35,7 +35,9 @@ import java.util.Arrays;
 
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 
+import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
 /** Status bar, shows message and info on the GUI. */
@@ -48,8 +50,9 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
      */
     private static final long serialVersionUID = 5;
     /** Mig layout component restraints. */
-    private static final String COMPONENT_CONSTRAINTS
-            = "sgy components, hmax 20, hmin 20, wmin 20, shrink 0";
+    private final String componentConstraints;
+    /** Height for the status bar. */
+    private final int height;
     /** message label. */
     private final MessageLabel messageLabel;
     /** error panel. */
@@ -69,6 +72,11 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
             final MainFrame mainFrame) {
         super();
 
+        height = getFontMetrics(UIManager.getFont("Table.font")).getHeight()
+                + (int) PlatformDefaults.getUnitValueX("related").getValue();
+        componentConstraints = "sgy components, hmax "+height+", hmin "+height
+                +", wmin 20, shrink 0";
+
         messageLabel = new MessageLabel(controller, mainFrame);
         errorPanel = new ErrorPanel(controller, mainFrame, this);
         updateLabel = new UpdaterLabel(controller);
@@ -76,10 +84,11 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
 
         setLayout(new MigLayout("fill, ins 0, hidemode 3"));
 
-        add(messageLabel, "growx, pushx, sgy components, hmax 20, hmin 20");
-        add(updateLabel, COMPONENT_CONSTRAINTS);
-        add(errorPanel, COMPONENT_CONSTRAINTS);
-        add(inviteLabel, COMPONENT_CONSTRAINTS);
+        add(messageLabel, "growx, pushx, sgy components, hmax "+height
+                +", hmin "+height);
+        add(updateLabel, componentConstraints);
+        add(errorPanel, componentConstraints);
+        add(inviteLabel, componentConstraints);
     }
 
     /** {@inheritDoc} */
@@ -112,10 +121,10 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
                     remove(updateLabel);
                     remove(errorPanel);
                     remove(inviteLabel);
-                    add((Component) component, COMPONENT_CONSTRAINTS);
-                    add(updateLabel, COMPONENT_CONSTRAINTS);
-                    add(inviteLabel, COMPONENT_CONSTRAINTS);
-                    add(errorPanel, COMPONENT_CONSTRAINTS);
+                    add((Component) component, componentConstraints);
+                    add(updateLabel, componentConstraints);
+                    add(inviteLabel, componentConstraints);
+                    add(errorPanel, componentConstraints);
                     validate();
                 }
             });

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -41,6 +41,7 @@ import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JTree;
+import javax.swing.UIManager;
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
@@ -95,7 +96,8 @@ public class Tree extends JTree implements MouseMotionListener,
         getSelectionModel().setSelectionMode(
                 TreeSelectionModel.SINGLE_TREE_SELECTION);
         setRootVisible(false);
-        setRowHeight(16);
+        setRowHeight(getFontMetrics(
+                UIManager.getFont("Tree.font")).getHeight() + 2);
         setOpaque(true);
         setBorder(BorderFactory.createEmptyBorder(
                 (int) PlatformDefaults.getUnitValueX("related").getValue(),