Changeset 5348 in josm
- Timestamp:
- 2012-07-17T23:47:12+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java
r5206 r5348 565 565 if (selected || member) 566 566 { 567 g.setColor(selected? selectedColor : relationSelectedColor); 567 Color color = null; 568 if (inactive || n.isDisabled()) { 569 color = inactiveColor; 570 } else if (selected) { 571 color = selectedColor; 572 } else { 573 color = relationSelectedColor; 574 } 575 g.setColor(color); 568 576 g.drawRect(p.x-w/2-2, p.y-h/2-2, w+4, h+4); 569 577 } … … 862 870 area.contains(centeredNBounds) // slow but nice 863 871 ) { 864 g.setColor(text.color); 872 if (inactive || osm.isDisabled()) { 873 g.setColor(inactiveColor); 874 } else { 875 g.setColor(text.color); 876 } 865 877 Font defaultFont = g.getFont(); 866 878 g.setFont (text.font); … … 910 922 911 923 if (selected) { 912 g.setColor( relationSelectedColor);924 g.setColor(inactive ? inactiveColor : relationSelectedColor); 913 925 g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4); 914 926 }
Note:
See TracChangeset
for help on using the changeset viewer.