Changeset 2043 in josm

Timestamp:

Sep 3, 2009 7:06:28 PM (4 years ago)

Author:

Gubaer

Message:

fixed #3076: Member columns don't auto-resize when the relation editor is resized

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• GenericRelationEditor.java (modified) (1 diff)
• MemberTable.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -321 +321 @@
 
         final JScrollPane scrollPane = new JScrollPane(memberTable);
-        // this adapters ensures that the width of the tag table columns is adjusted
-        // to the width of the scroll pane viewport. Also tried to overwrite
-        // getPreferredViewportSize() in JTable, but did not work.
-        //
-        scrollPane.addComponentListener(new ComponentAdapter() {
-            @Override
-            public void componentResized(ComponentEvent e) {
-                super.componentResized(e);
-                Dimension d = scrollPane.getViewport().getExtentSize();
-                memberTable.adjustColumnWidth(d.width);
-            }
-        });
 
         GridBagConstraints gc = new GridBagConstraints();

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -13 +15 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JTable;
+import javax.swing.JViewport;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
@@ -72 +75 @@
     }
 
-    /**
-     * adjusts the width of the columns for the tag name and the tag value to the width of the
-     * scroll panes viewport.
-     *
-     * Note: {@see #getPreferredScrollableViewportSize()} did not work as expected
-     *
-     * @param scrollPaneWidth the width of the scroll panes viewport
-     */
-    public void adjustColumnWidth(int scrollPaneWidth) {
-        TableColumnModel tcm = getColumnModel();
-        int width = scrollPaneWidth;
-        width = width / 3;
-        if (width > 0) {
-            tcm.getColumn(0).setMinWidth(width);
-            tcm.getColumn(0).setMaxWidth(width);
-            tcm.getColumn(1).setMinWidth(width);
-            tcm.getColumn(1).setMaxWidth(width);
-            tcm.getColumn(2).setMinWidth(width);
-            tcm.getColumn(2).setMaxWidth(width);
-
-        }
+    @Override
+    public Dimension getPreferredSize(){
+        Container c = getParent();
+        while(c != null && ! (c instanceof JViewport)) {
+            c = c.getParent();
+        }
+        if (c != null) {
+            Dimension d = super.getPreferredSize();
+            d.width = c.getSize().width;
+            return d;
+        }
+        return super.getPreferredSize();
     }