Changeset 3222 in josm for trunk

Timestamp:

2010-05-08T17:44:45+02:00 (14 years ago)

Author:

jttt

Message:

Fix #4396 Priorities for style elements working only partially

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java (modified) (1 diff)

trunk/build.xml

@@ -33 +33 @@
         -->
         <target name="create-revision-eclipse">
+                <copy file="styles/standard/elemstyles.xml" todir="data"/>
                 <property name="revision.dir" value="bin"/>
                 <antcall target="create-revision" />

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -180 +180 @@
     }
 
-    public void drawNodeIcon(Node n, ImageIcon icon, boolean annotate, boolean selected, String name) {
+    public void drawNodeIcon(Node n, ImageIcon icon, boolean selected, String name) {
         Point p = nc.getPoint(n);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;

trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java

@@ -42 +42 @@
         if (painter.isShowIcons()) {
             Node n = (Node) primitive;
-            String name = painter.isShowNames()?painter.getNodeName(n):null;
-            painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon,
-                    annotate, selected, name);
+            String name = painter.isShowNames() && annotate?painter.getNodeName(n):null;
+            painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon, selected, name);
         } else {
             SimpleNodeElemStyle.INSTANCE.paintPrimitive(primitive, settings, painter, selected);