Changeset 7555 in josm
- Timestamp:
- 2014-09-18T01:18:53+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r7553 r7555 310 310 private boolean showNames; 311 311 private boolean showIcons; 312 private boolean 312 private boolean isOutlineOnly; 313 313 314 314 private Font orderFont; … … 1499 1499 if (n.isDisabled()) { 1500 1500 add(n, FLAG_DISABLED); 1501 } else if ( data.isSelected(n)) {1501 } else if (n.isSelected()) { 1502 1502 add(n, FLAG_SELECTED); 1503 1503 } else if (n.isMemberOfSelected()) { … … 1512 1512 if (w.isDisabled()) { 1513 1513 add(w, FLAG_DISABLED); 1514 } else if ( data.isSelected(w)) {1514 } else if (w.isSelected()) { 1515 1515 add(w, FLAG_SELECTED); 1516 1516 } else if (w.isMemberOfSelected()) { … … 1525 1525 if (r.isDisabled()) { 1526 1526 add(r, FLAG_DISABLED); 1527 } else if ( data.isSelected(r)) {1527 } else if (r.isSelected()) { 1528 1528 add(r, FLAG_SELECTED); 1529 } else if (r.isMemberOfSelected()) { 1530 add(r, FLAG_MEMBER_OF_SELECTED); 1529 1531 } else { 1530 1532 add(r, FLAG_NORMAL); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
r7549 r7555 340 340 if (isInactiveMode || r.isDisabled()) { 341 341 col = inactiveColor; 342 } else if ( ds.isSelected(r)) {342 } else if (r.isSelected()) { 343 343 col = selectedColor; 344 } else if (r.isMultipolygon() && r.isMemberOfSelected()) { 345 col = relationSelectedColor; 344 346 } else { 345 347 col = relationColor; -
trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java
r7383 r7555 87 87 @Override 88 88 public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) { 89 Color myColor = color; 89 90 if (osm instanceof Way) { 90 Color myColor = color; 91 if (color != null && osm.isSelected()) { 92 myColor = paintSettings.getSelectedColor(color.getAlpha()); 91 if (color != null) { 92 if (selected) { 93 myColor = paintSettings.getSelectedColor(color.getAlpha()); 94 } else if (member) { 95 myColor = paintSettings.getRelationSelectedColor(color.getAlpha()); 96 } 93 97 } 94 98 painter.drawArea((Way) osm, myColor, fillImage, text); 95 99 } else if (osm instanceof Relation) { 96 Color myColor = color; 97 if (color != null && selected) { 100 if (color != null && (selected || (member && ((Relation) osm).isMultipolygon()))) { 98 101 myColor = paintSettings.getRelationSelectedColor(color.getAlpha()); 99 102 }
Note:
See TracChangeset
for help on using the changeset viewer.