Changeset 8085 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

Timestamp:

2015-02-18T23:43:28+01:00 (11 years ago)

Author:

bastiK

Message:

fixed #10216 Offsetting node icon in MapCSS

also: rework of rendering of disabled layers and objects

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (modified) (3 diffs)

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

@@ -148 +148 @@
         int height = heightF == null ? -1 : Math.round(heightF);
 
+        float offsetXF = 0f;
+        float offsetYF = 0f;
+        if (keys[ICON_OFFSET_X_IDX] != null) {
+            offsetXF = c.get(keys[ICON_OFFSET_X_IDX], 0f, Float.class);
+            offsetYF = c.get(keys[ICON_OFFSET_Y_IDX], 0f, Float.class);
+        }
+
         final MapImage mapImage = new MapImage(iconRef.iconName, iconRef.source);
 
         mapImage.width = width;
         mapImage.height = height;
+        mapImage.offsetX = Math.round(offsetXF);
+        mapImage.offsetY = Math.round(offsetYF);
 
         mapImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.icon-image-alpha", 255))));
@@ -246 +255 @@
             Node n = (Node) primitive;
             if (mapImage != null && painter.isShowIcons()) {
-                final Image nodeIcon;
-                if (painter.isInactiveMode() || n.isDisabled()) {
-                    if (disabledNodeIcon == null || disabledNodeIconIsTemporary) {
-                        disabledNodeIcon = mapImage.getDisplayedNodeIcon(true);
-                        disabledNodeIconIsTemporary = mapImage.isTemporary();
-                    }
-                    nodeIcon = disabledNodeIcon;
-                } else {
-                    if (enabledNodeIcon == null || enabledNodeIconIsTemporary) {
-                        enabledNodeIcon = mapImage.getDisplayedNodeIcon(false);
-                        enabledNodeIconIsTemporary = mapImage.isTemporary();
-                    }
-                    nodeIcon = enabledNodeIcon;
-                }
-                painter.drawNodeIcon(n, nodeIcon, Utils.color_int2float(mapImage.alpha), selected, member);
+                painter.drawNodeIcon(n, mapImage, painter.isInactiveMode() || n.isDisabled(), selected, member);
             } else if (symbol != null) {
                 Color fillColor = symbol.fillColor;
@@ -321 +316 @@
             }
         } else if (primitive instanceof Relation && mapImage != null) {
-            painter.drawRestriction((Relation) primitive, mapImage);
+            painter.drawRestriction((Relation) primitive, mapImage, painter.isInactiveMode() || primitive.isDisabled());
         }
     }