Changeset 3291 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

Timestamp:

2010-06-01T19:20:46+02:00 (16 years ago)

Author:

stoecker

Message:

fix #4414 - draw selected relation and selected elements a bit different

File:

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

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

@@ -139 +139 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
         Way w = (Way)primitive;
         /* show direction arrows, if draw.segment.relevant_directions_only is not set,
@@ -180 +180 @@
             myColor = paintSettings.getHighlightColor();
         } else if (selected) {
-            myColor = paintSettings.getSelectedColor();
+            myColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor();
         } else if(w.isDisabled()) {
             myColor = paintSettings.getInactiveColor();
@@ -189 +189 @@
             for(LineElemStyle s : overlays) {
                 if(!s.over) {
-                    painter.drawWay(w, s.color != null && selected ? myColor: s.color, s.getWidth(myWidth),
+                    painter.drawWay(w, (s.color == null || selected) ? myColor: s.color, s.getWidth(myWidth),
                             s.getDashed(), s.dashedColor, false, false, false);
                 }
@@ -202 +202 @@
             for(LineElemStyle s : overlays) {
                 if(s.over) {
-                    painter.drawWay(w, s.color != null && selected ? myColor : s.color, s.getWidth(myWidth),
+                    painter.drawWay(w, (s.color == null || selected) ? myColor : s.color, s.getWidth(myWidth),
                             s.getDashed(), s.dashedColor, false, false, false);
                 }