Changeset 3233 in josm for trunk


Ignore:
Timestamp:
2010-05-11T21:20:27+02:00 (9 years ago)
Author:
stoecker
Message:

fix minor color issues

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
3 edited

Legend:

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

    r3225 r3233  
    172172    }
    173173
     174    public static Color getBackgroundColor() {
     175        return Main.pref.getColor(marktr("background"), Color.BLACK);
     176    }
     177
     178    public static Color getOutsideColor() {
     179        return Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW);
     180    }
     181
    174182    /**
    175183     * Initialize the hatch pattern used to paint the non-downloaded area
     
    178186        BufferedImage bi = new BufferedImage(15, 15, BufferedImage.TYPE_INT_ARGB);
    179187        Graphics2D big = bi.createGraphics();
    180         big.setColor(Main.pref.getColor(marktr("background"), Color.BLACK));
     188        big.setColor(getBackgroundColor());
    181189        Composite comp = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f);
    182190        big.setComposite(comp);
    183191        big.fillRect(0,0,15,15);
    184         big.setColor(Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW));
     192        big.setColor(getOutsideColor());
    185193        big.drawLine(0,15,15,0);
    186194        Rectangle r = new Rectangle(0, 0, 15,15);
  • trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

    r2850 r3233  
    237237        color.addActionListener(new ActionListener(){
    238238            public void actionPerformed(ActionEvent e) {
    239                 JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("GPS point"), "layer "+getName(), Color.gray));
     239                JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("gps point"), "layer "+getName(), Color.gray));
    240240                Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};
    241241                int answer = JOptionPane.showOptionDialog(
  • trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

    r2745 r3233  
    3737import org.openstreetmap.josm.gui.MapScaler;
    3838import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
     39import org.openstreetmap.josm.gui.layer.GpxLayer;
    3940import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
     41import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    4042import org.openstreetmap.josm.tools.ColorHelper;
    4143import org.openstreetmap.josm.tools.GBC;
     
    256258        PaintColors.getColors();
    257259        MarkerLayer.getColor(null);
     260        GpxLayer.getColor(null);
     261        OsmDataLayer.getBackgroundColor();
     262        OsmDataLayer.getOutsideColor();
    258263        MapScaler.getColor();
    259264        ConflictDialog.getColor();
Note: See TracChangeset for help on using the changeset viewer.