Changeset 4779 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-01-09T10:32:10+01:00 (13 years ago)

Author:

bastiK

Message:

see #7219 - CT-Column-Title in history window only displays ...

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• VersionTable.java (modified) (3 diffs)
• VersionTableColumnModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -56 +56 @@
             @Override
             public void tableChanged(TableModelEvent e) {
-                adjustColumnWidth(VersionTable.this, 0);
-                adjustColumnWidth(VersionTable.this, 4);
-                adjustColumnWidth(VersionTable.this, 5);
+                adjustColumnWidth(VersionTable.this, 0, 0);
+                adjustColumnWidth(VersionTable.this, 1, -8);
+                adjustColumnWidth(VersionTable.this, 2, -8);
+                adjustColumnWidth(VersionTable.this, 3, 0);
+                adjustColumnWidth(VersionTable.this, 4, 0);
+                adjustColumnWidth(VersionTable.this, 5, 0);
             }
         });
@@ -213 +216 @@
     }
 
-    private static void adjustColumnWidth(JTable tbl, int col) {
+    private static void adjustColumnWidth(JTable tbl, int col, int cellInset) {
         int maxwidth = 0;
 
@@ -220 +223 @@
             Object val = tbl.getValueAt(row, col);
             Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, row, col);
-            maxwidth = Math.max(comp.getPreferredSize().width, maxwidth);
+            maxwidth = Math.max(comp.getPreferredSize().width + cellInset, maxwidth);
         }
         TableCellRenderer tcr = tbl.getTableHeader().getDefaultRenderer();
         Object val = tbl.getColumnModel().getColumn(col).getHeaderValue();
         Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, -1, col);
-        maxwidth = Math.max(comp.getPreferredSize().width + Main.pref.getInteger("table.header-inset", 2), maxwidth);
+        maxwidth = Math.max(comp.getPreferredSize().width + Main.pref.getInteger("table.header-inset", 0), maxwidth);
 
         int spacing = tbl.getIntercellSpacing().width;

trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java

@@ -30 +30 @@
         col.setCellRenderer(bRenderer);
         col.setCellEditor(new VersionTable.RadioButtonEditor());
-        col.setMaxWidth(18);
         col.setResizable(false);
         addColumn(col);
@@ -38 +37 @@
         col.setCellRenderer(bRenderer);
         col.setCellEditor(new VersionTable.RadioButtonEditor());
-        col.setPreferredWidth(18);
         col.setResizable(false);
         addColumn(col);