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

Timestamp:

2016-02-24T00:09:28+01:00 (8 years ago)

Author:

Don-vip

Message:

see #11968, fix #12550 - in relation editor, node features are shown without name (only icon, regression from r8903)

Location:

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

Files:

• MemberTableMemberCellRenderer.java (modified) (1 diff)
• SelectionTableCellRenderer.java (modified) (1 diff)

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

@@ -25 +25 @@
     protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
         // Make icon the full height of the table cell. Icon background is square.
-        setIcon(ImageProvider.getPadded(primitive, cellSize));
+        int size = Math.min(cellSize.width, cellSize.height);
+        setIcon(ImageProvider.getPadded(primitive, new Dimension(size, size)));
         setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
         setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));

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

@@ -61 +61 @@
 
     protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
-        setIcon(ImageProvider.getPadded(primitive, cellSize));
+        int size = Math.min(cellSize.width, cellSize.height);
+        setIcon(ImageProvider.getPadded(primitive, new Dimension(size, size)));
         setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
         setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));