Browse Source

Fix truncating treeview node labels.

Change-Id: I9fc697bf7cf8cd362f2d76696d2207ef5d40b7f8
Fixes-Issue: CLIENT-358
Reviewed-on: http://gerrit.dmdirc.com/2427
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.7rc1
Greg Holmes 12 years ago
parent
commit
f43fec4162

+ 0
- 8
src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java View File

@@ -34,17 +34,14 @@ import com.dmdirc.ui.IconManager;
34 34
 import com.dmdirc.ui.messages.Styliser;
35 35
 
36 36
 import java.awt.Color;
37
-import java.awt.Dimension;
38 37
 import java.awt.Font;
39 38
 
40
-import javax.swing.BorderFactory;
41 39
 import javax.swing.JPanel;
42 40
 import javax.swing.JTextPane;
43 41
 import javax.swing.UIManager;
44 42
 import javax.swing.text.DefaultStyledDocument;
45 43
 import javax.swing.text.StyledDocument;
46 44
 
47
-import net.miginfocom.layout.PlatformDefaults;
48 45
 import net.miginfocom.swing.MigLayout;
49 46
 
50 47
 /**
@@ -108,11 +105,6 @@ public class NodeLabel extends JPanel implements SelectionListener,
108 105
 
109 106
         icon.setToolTipText(null);
110 107
         text.setToolTipText(null);
111
-        setBorder(BorderFactory.createEmptyBorder(1, 0, 2, 0));
112
-
113
-        setPreferredSize(new Dimension(100000, getFont().getSize()
114
-                + (int) PlatformDefaults.getUnitValueX("related").
115
-                getValue()));
116 108
         notificationColour = null;
117 109
         selected = false;
118 110
     }

+ 5
- 5
src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewTreeCellRenderer.java View File

@@ -31,12 +31,12 @@ import java.awt.Color;
31 31
 import java.awt.Component;
32 32
 import java.awt.Dimension;
33 33
 
34
+import javax.swing.BorderFactory;
34 35
 import javax.swing.JLabel;
35 36
 import javax.swing.JTree;
37
+import javax.swing.UIManager;
36 38
 import javax.swing.tree.TreeCellRenderer;
37 39
 
38
-import net.miginfocom.layout.PlatformDefaults;
39
-
40 40
 /**
41 41
  * Displays a node in a tree according to its type.
42 42
  */
@@ -135,9 +135,9 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
135 135
         label.setBackground(background);
136 136
         label.setOpaque(true);
137 137
         label.setTextStyle(styliser, sb.toString());
138
-        label.setPreferredSize(new Dimension(100000, label.getFont().getSize()
139
-                + (int) (PlatformDefaults.getUnitValueX("related").
140
-                getValue())));
138
+        label.setBorder(BorderFactory.createEmptyBorder(1, 0, 2, 0));
139
+        label.setPreferredSize(new Dimension(100000, tree.getFontMetrics(
140
+                UIManager.getFont("Tree.font")).getHeight() + 2));
141 141
 
142 142
         return label;
143 143
     }

Loading…
Cancel
Save