Changeset 3222 in josm for trunk/src


Ignore:
Timestamp:
2010-05-08T17:44:45+02:00 (10 years ago)
Author:
jttt
Message:

Fix #4396 Priorities for style elements working only partially

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

    r3201 r3222  
    180180    }
    181181
    182     public void drawNodeIcon(Node n, ImageIcon icon, boolean annotate, boolean selected, String name) {
     182    public void drawNodeIcon(Node n, ImageIcon icon, boolean selected, String name) {
    183183        Point p = nc.getPoint(n);
    184184        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
  • trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java

    r2675 r3222  
    4242        if (painter.isShowIcons()) {
    4343            Node n = (Node) primitive;
    44             String name = painter.isShowNames()?painter.getNodeName(n):null;
    45             painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon,
    46                     annotate, selected, name);
     44            String name = painter.isShowNames() && annotate?painter.getNodeName(n):null;
     45            painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon, selected, name);
    4746        } else {
    4847            SimpleNodeElemStyle.INSTANCE.paintPrimitive(primitive, settings, painter, selected);
Note: See TracChangeset for help on using the changeset viewer.