Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 2136)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 2137)
@@ -34,4 +34,5 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
+import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.Popup;
@@ -194,6 +195,5 @@
}
- JPanel c = new JPanel(new GridBagLayout());
- c.setBorder(BorderFactory.createRaisedBevelBorder());
+ final JPanel c = new JPanel(new GridBagLayout());
final JLabel lbl = new JLabel(
""+tr("Middle click again, to cycle through.
"+
@@ -240,5 +240,6 @@
/**
* Creates a popup for the given content next to the cursor. Tries to
- * keep the popup on screen.
+ * keep the popup on screen and shows a vertical scrollbar, if the
+ * screen is too small.
* @param content
* @param ms
@@ -257,11 +258,23 @@
}
int yPos = p.y + ms.mousePos.y + 16;
- // Move the popup up if it would be cut off at its bottom
+ // Move the popup up if it would be cut off at its bottom but do not
+ // move it off screen on the top
if(yPos + dim.height > scrn.height - 5) {
- yPos = scrn.height - dim.height - 5;
- }
+ yPos = Math.max(5, scrn.height - dim.height - 5);
+ }
+
+ // Create a JScrollPane around the content, in case there's still
+ // not enough space
+ JScrollPane sp = new JScrollPane(content);
+ sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+ sp.setBorder(BorderFactory.createRaisedBevelBorder());
+ // Implement max-size content-independent
+ Dimension prefsize = sp.getPreferredSize();
+ int w = Math.min(prefsize.width, scrn.width/2);
+ int h = Math.min(prefsize.height, scrn.height - 10);
+ sp.setPreferredSize(new Dimension(w, h));
PopupFactory pf = PopupFactory.getSharedInstance();
- return pf.getPopup(mv, content, xPos, yPos);
+ return pf.getPopup(mv, sp, xPos, yPos);
}
@@ -394,16 +407,22 @@
String name = osm.getDisplayName(DefaultNameFormatter.getInstance());
if (osm.getId() == 0 || osm.isModified()) {
- name = ""+ osm.getDisplayName(DefaultNameFormatter.getInstance())+"*";
+ name = ""+ name + "*";
}
text.append(name);
+
if (osm.getId() != 0) {
- text.append("
id="+osm.getId());
- }
+ text.append(" [id="+osm.getId()+"]");
+ }
+
+ if(osm.user != null) {
+ text.append(" [" + tr("User:") + " " + osm.user.getName() + "]");
+ }
+
for (Entry e1 : osm.entrySet()) {
- text.append("
"+e1.getKey()+"="+e1.getValue());
+ text.append("
" + e1.getKey() + "=" + e1.getValue());
}
final JLabel l = new JLabel(
- ""+text.toString()+"",
+ "" +text.toString() + "",
ImageProvider.get(OsmPrimitiveType.from(osm)),
JLabel.HORIZONTAL