- Timestamp:
- 2010-08-02T16:08:15+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java
r3319 r3405 151 151 Node lastN; 152 152 153 Color myColor = color;154 153 Color myDashedColor = dashedColor; 155 154 int myWidth = getWidth(); … … 177 176 } 178 177 178 Color markColor = null; 179 179 if(w.isHighlighted()) { 180 m yColor = paintSettings.getHighlightColor();180 markColor = paintSettings.getHighlightColor(); 181 181 } else if (selected) { 182 m yColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor();182 markColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor(); 183 183 } else if(w.isDisabled()) { 184 m yColor = paintSettings.getInactiveColor();184 markColor = paintSettings.getInactiveColor(); 185 185 myDashedColor = paintSettings.getInactiveColor(); 186 186 } … … 190 190 for(LineElemStyle s : overlays) { 191 191 if(!s.over) { 192 painter.drawWay(w, (s.color == null || selected) ? myColor: s.color, s.getWidth(myWidth), 193 s.getDashed(), 194 w.isDisabled() ? paintSettings.getInactiveColor() : s.dashedColor, 195 false, false, false); 192 painter.drawWay(w, 193 markColor != null ? 194 (s.color != null ? new Color(markColor.getRed(), markColor.getGreen(), markColor.getBlue(), s.color.getAlpha()) : markColor) : 195 s.color, 196 s.getWidth(myWidth), 197 s.getDashed(), 198 w.isDisabled() ? paintSettings.getInactiveColor() : s.dashedColor, 199 false, false, false); 196 200 } 197 201 } … … 199 203 200 204 /* draw the way */ 201 painter.drawWay(w, myColor, myWidth, dashed, myDashedColor, showDirection, selected ? false : reversedDirection, showOnlyHeadArrowOnly); 205 painter.drawWay(w, markColor != null ? markColor : color, myWidth, dashed, myDashedColor, showDirection, 206 selected ? false : reversedDirection, showOnlyHeadArrowOnly); 202 207 203 208 /* draw overlays above the way */ … … 205 210 for(LineElemStyle s : overlays) { 206 211 if(s.over) { 207 painter.drawWay(w, (s.color == null || selected) ? myColor : s.color, s.getWidth(myWidth), 208 s.getDashed(), s.dashedColor, false, false, false); 212 painter.drawWay(w, 213 markColor != null ? 214 (s.color != null ? new Color(markColor.getRed(), markColor.getGreen(), markColor.getBlue(), s.color.getAlpha()) : markColor) : 215 s.color, 216 s.getWidth(myWidth), 217 s.getDashed(), 218 s.dashedColor, 219 false, false, false); 209 220 } 210 221 }
Note:
See TracChangeset
for help on using the changeset viewer.