Changeset 9248 in josm for trunk/src/org


Ignore:
Timestamp:
2016-01-01T22:41:38+01:00 (4 years ago)
Author:
simon04
Message:

fix #11237 - Change default color of waypoints and GPS tracks to magenta

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

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

    r9234 r9248  
    8181    private int hdopAlpha;
    8282
     83    private static final Color DEFAULT_COLOR = Color.magenta;
    8384
    8485    // lookup array to draw arrows without doing any math
     
    128129     */
    129130    public Color getColor(String layerName, boolean ignoreCustom) {
    130         Color c = Main.pref.getColor(marktr("gps point"), specName(layerName), Color.gray);
     131        Color c = Main.pref.getColor(marktr("gps point"), specName(layerName), DEFAULT_COLOR);
    131132        return ignoreCustom || getColorMode(layerName) == ColorMode.NONE ? c : null;
    132133    }
     
    151152     **/
    152153    public static Color getGenericColor() {
    153         return Main.pref.getColor(marktr("gps point"), Color.gray);
     154        return Main.pref.getColor(marktr("gps point"), DEFAULT_COLOR);
    154155    }
    155156
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

    r8846 r9248  
    7474    public AudioMarker syncAudioMarker;
    7575
     76    private static final Color DEFAULT_COLOR = Color.magenta;
     77
    7678    /**
    7779     * Constructs a new {@code MarkerLayer}.
     
    190192    public Color getColor(boolean ignoreCustom) {
    191193        String name = getName();
    192         return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, Color.gray);
     194        return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, DEFAULT_COLOR);
    193195    }
    194196
    195197    /* for preferences */
    196198    public static Color getGenericColor() {
    197         return Main.pref.getColor(marktr("gps marker"), Color.gray);
     199        return Main.pref.getColor(marktr("gps marker"), DEFAULT_COLOR);
    198200    }
    199201
Note: See TracChangeset for help on using the changeset viewer.