Changeset 5217 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java

Timestamp:

2012-05-06T21:23:18+02:00 (12 years ago)

Author:

bastiK

Message:

mapcss: change z-index handling

In contrast to previous default z-index of 1000 for nodes and -1000 for areas, the default z-index is
now always 0. An additional "major-z-index" is used to sort elemstyles by category, this property
can be adjusted in the style, so icons can be rendered below lines, if you want to.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java (modified) (2 diffs)

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

@@ -90 +90 @@
 
     public BoxTextElemStyle(Cascade c, TextElement text, BoxProvider boxProvider, Rectangle box, HorizontalTextAlignment hAlign, VerticalTextAlignment vAlign) {
-        super(c, 2000f);
+        super(c, 5f);
         CheckParameterUtil.ensureParameterNotNull(text);
         CheckParameterUtil.ensureParameterNotNull(hAlign);
@@ -197 +197 @@
         if (boxProvider != null) {
             if (!boxProvider.equals(other.boxProvider)) return false;
-        } else if (other.boxProvider != null) {
+        } else if (other.boxProvider != null)
             return false;
-        } else {
+        else {
             if (!box.equals(other.box)) return false;
         }