diff --git a/diylc/diylc-library/src/org/diylc/components/misc/Image.java b/diylc/diylc-library/src/org/diylc/components/misc/Image.java index d2ea946f..f014cb0c 100644 --- a/diylc/diylc-library/src/org/diylc/components/misc/Image.java +++ b/diylc/diylc-library/src/org/diylc/components/misc/Image.java @@ -57,7 +57,7 @@ public class Image extends AbstractTransparentComponent { private static final long serialVersionUID = 1L; public static String DEFAULT_TEXT = "Double click to edit text"; private static ImageIcon ICON; - private static byte DEFAULT_SCALE = 50; + private static byte DEFAULT_SCALE = 25; static { String name = "image.png"; @@ -78,7 +78,8 @@ public class Image extends AbstractTransparentComponent { @Deprecated private ImageIcon image; private byte[] data; - private byte scale = DEFAULT_SCALE; + private Byte scale; + private byte newScale = DEFAULT_SCALE; public Image() { try { @@ -91,7 +92,7 @@ public class Image extends AbstractTransparentComponent { @Override public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project, IDrawingObserver drawingObserver) { - double s = 1d * scale / DEFAULT_SCALE; + double s = 1d * getScale() / DEFAULT_SCALE; Shape clip = g2d.getClip().getBounds(); if (!clip.intersects(new Rectangle2D.Double(point.getX(), point.getY(), getImage().getIconWidth() * s, getImage() .getIconHeight() * s))) { @@ -171,14 +172,18 @@ public class Image extends AbstractTransparentComponent { this.image = null; } - @PercentEditor(_100PercentValue = 50) + @PercentEditor(_100PercentValue = 25) @EditableProperty(defaultable = false) public byte getScale() { - return scale; + if (scale != null) { + newScale = (byte) (scale / 2); + scale = null; + } + return newScale; } public void setScale(byte scale) { - this.scale = scale; + this.newScale = scale; } @Override diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index a59b00e6..2c5a1afa 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index d361bc94..0b8d631f 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2496,7 +2496,7 @@ IMPROVEMENT - Allow a file to be loaded if it references a missing component property, but show a warning. + Allow a file to be loaded if it references a missing component property, but show a warning BUG_FIX @@ -2518,6 +2518,10 @@ NEW_FEATURE Show wire diameter in mm and in next to AWG gauge + + IMPROVEMENT + Increase the range of zoom slider for images to 500% + https://github.com/bancika/diy-layout-creator/releases