Changeset 3405 in josm for trunk/src

Timestamp:

2010-08-02T16:08:15+02:00 (15 years ago)

Author:

bastiK

Message:

changed drawing of highlighted, selected and disabled ways to adapt the alpha value of overlays. see #5292

File:

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

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

@@ -151 +151 @@
         Node lastN;
 
-        Color myColor = color;
         Color myDashedColor = dashedColor;
         int myWidth = getWidth();
@@ -177 +176 @@
         }
 
+        Color markColor = null;
         if(w.isHighlighted()) {
-            myColor = paintSettings.getHighlightColor();
+            markColor = paintSettings.getHighlightColor();
         } else if (selected) {
-            myColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor();
+            markColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor();
         } else if(w.isDisabled()) {
-            myColor = paintSettings.getInactiveColor();
+            markColor = paintSettings.getInactiveColor();
             myDashedColor = paintSettings.getInactiveColor();
         }
@@ -190 +190 @@
             for(LineElemStyle s : overlays) {
                 if(!s.over) {
-                    painter.drawWay(w, (s.color == null || selected) ? myColor: s.color, s.getWidth(myWidth),
-                            s.getDashed(),
-                            w.isDisabled() ? paintSettings.getInactiveColor() : s.dashedColor,
-                            false, false, false);
+                    painter.drawWay(w,
+                        markColor != null ?
+                            (s.color != null ? new Color(markColor.getRed(), markColor.getGreen(), markColor.getBlue(), s.color.getAlpha()) : markColor) :
+                            s.color,
+                        s.getWidth(myWidth),
+                        s.getDashed(),
+                        w.isDisabled() ? paintSettings.getInactiveColor() : s.dashedColor,
+                        false, false, false);
                 }
             }
@@ -199 +203 @@
 
         /* draw the way */
-        painter.drawWay(w, myColor, myWidth, dashed, myDashedColor, showDirection, selected ? false : reversedDirection, showOnlyHeadArrowOnly);
+        painter.drawWay(w, markColor != null ? markColor : color, myWidth, dashed, myDashedColor, showDirection,
+                    selected ? false : reversedDirection, showOnlyHeadArrowOnly);
 
         /* draw overlays above the way */
@@ -205 +210 @@
             for(LineElemStyle s : overlays) {
                 if(s.over) {
-                    painter.drawWay(w, (s.color == null || selected) ? myColor : s.color, s.getWidth(myWidth),
-                            s.getDashed(), s.dashedColor, false, false, false);
+                    painter.drawWay(w,
+                        markColor != null ?
+                            (s.color != null ? new Color(markColor.getRed(), markColor.getGreen(), markColor.getBlue(), s.color.getAlpha()) : markColor) :
+                            s.color,
+                        s.getWidth(myWidth),
+                        s.getDashed(),
+                        s.dashedColor,
+                        false, false, false);
                 }
             }