Changeset 3301 in josm for trunk/src/org

Timestamp:

2010-06-03T13:29:08+02:00 (14 years ago)

Author:

bastiK

Message:

draw dashes of disabled ways in inactive color

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java (modified) (4 diffs)

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

@@ -153 +153 @@
 
         Color myColor = color;
+        Color myDashedColor = dashedColor;
         int myWidth = getWidth();
 
@@ -183 +184 @@
         } else if(w.isDisabled()) {
             myColor = paintSettings.getInactiveColor();
+            myDashedColor = paintSettings.getInactiveColor();
         }
 
@@ -190 +192 @@
                 if(!s.over) {
                     painter.drawWay(w, (s.color == null || selected) ? myColor: s.color, s.getWidth(myWidth),
-                            s.getDashed(), s.dashedColor, false, false, false);
+                            s.getDashed(),
+                            w.isDisabled() ? paintSettings.getInactiveColor() : s.dashedColor,
+                            false, false, false);
                 }
             }
@@ -196 +200 @@
 
         /* draw the way */
-        painter.drawWay(w, myColor, myWidth, dashed, dashedColor, showDirection, selected ? false : reversedDirection, showOnlyHeadArrowOnly);
+        painter.drawWay(w, myColor, myWidth, dashed, myDashedColor, showDirection, selected ? false : reversedDirection, showOnlyHeadArrowOnly);
 
         /* draw overlays above the way */