Changeset 10760 in josm
- Timestamp:
- 2016-08-07T17:49:25+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
r10748 r10760 54 54 ); 55 55 56 fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));56 fillImage.alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.fill-image-alpha", 255))); 57 57 Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class)); 58 58 if (pAlpha != null) { … … 69 69 // right, especially as named map colors can be changed in 70 70 // the preference GUI and written to the preferences file. 71 alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));71 alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.fillalpha", 50))); 72 72 } 73 73 Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class)); -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
r10748 r10760 184 184 mapImage.offsetY = Math.round(offsetYF); 185 185 186 mapImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.icon-image-alpha", 255))));186 mapImage.alpha = Math.min(255, Math.max(0, Main.pref.getInteger("mappaint.icon-image-alpha", 255))); 187 187 Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class)); 188 188 if (pAlpha != null) {
Note:
See TracChangeset
for help on using the changeset viewer.