Ver código fonte

fixes issue 3229

Change-Id: I2f683b7487add4e5c45a210636c719ff2c10f5c1
Reviewed-on: http://gerrit.dmdirc.com/142
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3b1
Gregory Holmes 14 anos atrás
pai
commit
692fbb9fc3

+ 10
- 3
src/com/dmdirc/addons/ui_swing/components/renderers/TopicCellRenderer.java Ver arquivo

@@ -27,10 +27,13 @@ import com.dmdirc.addons.ui_swing.dialogs.channelsetting.TopicLabel;
27 27
 import java.awt.Component;
28 28
 
29 29
 import javax.swing.JLabel;
30
+import javax.swing.JPanel;
30 31
 import javax.swing.JTable;
31 32
 import javax.swing.UIManager;
32 33
 import javax.swing.table.TableCellRenderer;
33 34
 
35
+import net.miginfocom.swing.MigLayout;
36
+
34 37
 /**
35 38
  * Topic list cell renderer.
36 39
  */
@@ -51,8 +54,10 @@ public class TopicCellRenderer implements TableCellRenderer {
51 54
     @Override
52 55
     public Component getTableCellRendererComponent(JTable table, Object value,
53 56
             boolean isSelected, boolean hasFocus, int row, int column) {
57
+        final JPanel panel;
54 58
         if (value instanceof TopicLabel) {
55 59
             final TopicLabel label = (TopicLabel) value;
60
+            panel = label;
56 61
             if (isSelected) {
57 62
                 label.setBackground(UIManager.getColor(
58 63
                         "Table.selectionBackground"));
@@ -60,10 +65,12 @@ public class TopicCellRenderer implements TableCellRenderer {
60 65
                 label.setBackground(UIManager.getColor(
61 66
                         "Table.background"));
62 67
             }
63
-            table.setRowHeight(row, label.getPreferredSize().height);
64
-            return label;
65 68
         } else {
66
-            return new JLabel(value.toString());
69
+            panel = new JPanel(new MigLayout());
70
+            panel.add(new JLabel(value.toString()));
71
+            
67 72
         }
73
+        table.setRowHeight(row, panel.getPreferredSize().height);
74
+        return panel;
68 75
     }
69 76
 }

+ 4
- 4
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicLabel.java Ver arquivo

@@ -62,15 +62,15 @@ public class TopicLabel extends JPanel {
62 62
         setLayout(new MigLayout("fillx, ins 0"));
63 63
 
64 64
         OldTextLabel label = new OldTextLabel(topic.getTopic());
65
-        add(label, "wmax 450, growy, pushy, wrap");
65
+        add(label, "wmax 450, growy, pushy, wrap, gapleft 5, gaptop 5");
66 66
 
67 67
         label = new OldTextLabel("Set on: " + new Date(topic.getTime() * 1000).toString());
68
-        add(label, "wmax 450, growy, pushy, wrap");
68
+        add(label, "wmax 450, growy, pushy, wrap, gapleft 5");
69 69
 
70 70
         label = new OldTextLabel("By: " + topic.getClient());
71
-        add(label, "wmax 450, growy, pushy, wrap");
71
+        add(label, "wmax 450, growy, pushy, wrap, gapleft 5");
72 72
 
73
-        add(new JSeparator(), "newline, span, growx, pushx, gaptop 5");
73
+        add(new JSeparator(), "newline, span, growx, pushx");
74 74
     }
75 75
 
76 76
     /**

Carregando…
Cancelar
Salvar