Changeset 9341 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Timestamp:

2016-01-07T18:13:44+01:00 (8 years ago)

Author:

bastiK

Message:

mapcss: basic support for :selected pseudoclass (see #9891)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

• AreaElement.java (modified) (1 diff)
• LineElement.java (modified) (9 diffs)
• LineTextElement.java (modified) (1 diff)
• NodeElement.java (modified) (2 diffs)
• RepeatImageElement.java (modified) (1 diff)
• StyleElement.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -138 +138 @@
     @Override
     public int hashCode() {
-        int hash = 3;
+        int hash = super.hashCode();
         hash = 61 * hash + color.hashCode();
         hash = 61 * hash + (extent != null ? Float.floatToIntBits(extent) : 0);

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -32 +32 @@
             c.put(Z_INDEX, -3f);
         }
-        return createLine(new Environment(null, mc, "default", null));
+        Way w = new Way();
+        return createLine(new Environment(w, mc, "default", null));
     }
 
@@ -42 +43 @@
     public float offset;
     public float realWidth; // the real width of this line in meter
+    public boolean wayDirectionArrows;
 
     private BasicStroke dashesLine;
@@ -61 +63 @@
 
     protected LineElement(Cascade c, float default_major_z_index, BasicStroke line, Color color, BasicStroke dashesLine,
-            Color dashesBackground, float offset, float realWidth) {
+            Color dashesBackground, float offset, float realWidth, boolean wayDirectionArrows) {
         super(c, default_major_z_index);
         this.line = line;
@@ -69 +71 @@
         this.offset = offset;
         this.realWidth = realWidth;
+        this.wayDirectionArrows = wayDirectionArrows;
     }
 
@@ -264 +267 @@
         }
 
-        return new LineElement(c, type.defaultMajorZIndex, line, color, dashesLine, dashesBackground, offset, realWidth);
+        boolean wayDirectionArrows = c.get(type.prefix + WAY_DIRECTION_ARROWS, env.osm.isSelected(), Boolean.class);
+
+        return new LineElement(c, type.defaultMajorZIndex, line, color, dashesLine, dashesBackground,
+                offset, realWidth, wayDirectionArrows);
     }
 
@@ -274 +280 @@
         the way is tagged with a direction key
         (even if the tag is negated as in oneway=false) or the way is selected */
-        boolean showOrientation = !isModifier && (selected || paintSettings.isShowDirectionArrow()) && !paintSettings.isUseRealWidth();
+        boolean showOrientation;
+        if (defaultSelectedHandling) {
+            showOrientation = !isModifier && (selected || paintSettings.isShowDirectionArrow()) && !paintSettings.isUseRealWidth();
+        } else {
+            showOrientation = wayDirectionArrows;
+        }
         boolean showOneway = !isModifier && !selected &&
                 !paintSettings.isUseRealWidth() &&
@@ -300 +311 @@
 
         Color myColor = color;
-        if (selected) {
+        if (defaultSelectedHandling && selected) {
             myColor = paintSettings.getSelectedColor(color.getAlpha());
         } else if (member || outermember) {
@@ -342 +353 @@
             Objects.equals(dashesBackground, other.dashesBackground) &&
             offset == other.offset &&
-            realWidth == other.realWidth;
+            realWidth == other.realWidth &&
+            wayDirectionArrows == other.wayDirectionArrows;
     }
 
@@ -354 +366 @@
         hash = 29 * hash + Float.floatToIntBits(offset);
         hash = 29 * hash + Float.floatToIntBits(realWidth);
+        hash = 29 * hash + (this.wayDirectionArrows ? 1 : 0);
         return hash;
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineTextElement.java

@@ -54 +54 @@
     @Override
     public int hashCode() {
-        return text.hashCode();
+        int hash = super.hashCode();
+        hash = 43 * hash + text.hashCode();
+        return hash;
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java

@@ -285 +285 @@
                     if (painter.isInactiveMode() || n.isDisabled()) {
                         fillColor = settings.getInactiveColor();
-                    } else if (selected) {
+                    } else if (defaultSelectedHandling && selected) {
                         fillColor = settings.getSelectedColor(fillColor.getAlpha());
                     } else if (member) {
@@ -295 +295 @@
                     if (painter.isInactiveMode() || n.isDisabled()) {
                         strokeColor = settings.getInactiveColor();
-                    } else if (selected) {
+                    } else if (defaultSelectedHandling && selected) {
                         strokeColor = settings.getSelectedColor(strokeColor.getAlpha());
                     } else if (member) {

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java

@@ -81 +81 @@
     @Override
     public int hashCode() {
-        int hash = 7;
+        int hash = super.hashCode();
         hash = 83 * hash + this.pattern.hashCode();
         hash = 83 * hash + Float.floatToIntBits(this.offset);

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java

@@ -32 +32 @@
     public boolean isModifier;  // false, if style can serve as main style for the
     // primitive; true, if it is a highlight or modifier
-
-    public StyleElement(float major_z_index, float z_index, float object_z_index, boolean isModifier) {
+    public boolean defaultSelectedHandling;
+
+    public StyleElement(float major_z_index, float z_index, float object_z_index, boolean isModifier, boolean defaultSelectedHandling) {
         this.majorZIndex = major_z_index;
         this.zIndex = z_index;
         this.objectZIndex = object_z_index;
         this.isModifier = isModifier;
+        this.defaultSelectedHandling = defaultSelectedHandling;
     }
 
@@ -45 +47 @@
         objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class);
         isModifier = c.get(MODIFIER, Boolean.FALSE, Boolean.class);
+        defaultSelectedHandling = c.isDefaultSelectedHandling();
     }