diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 96f68c5d..60320f00 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java index 3548be96..f8438fe0 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/Resistor.java @@ -179,15 +179,15 @@ public class Resistor extends AbstractLeadedComponent { @Override protected int getLabelOffset(int bodyWidth, int labelWidth) { - if (value == null) + if (value == null || getColorCode() == ResistorColorCode.NONE) return 0; int width = getClosestOdd(getWidth().convertToPixels()); Color[] bands = value.getColorCode(colorCode); int bandArea = getShape() == ResistorShape.Standard ? width + FIRST_BAND + BAND_SPACING * (bands.length - 1) : -FIRST_BAND + BAND_SPACING * (bands.length - 1); - - return (bodyWidth - bandArea - labelWidth) / 2; + + return bandArea / 2; } @EditableProperty(name = "Reverse (standing)") diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 96f68c5d..60320f00 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 5cbf55af..7eaf4345 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 94a56134..a48fa777 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -1826,6 +1826,10 @@ IMPROVEMENT Increased padding between schematic symbols and their labels + + IMPROVEMENT + Better label position on resistors + BUG_FIX Auto-save dialog pops up when running multiple instances of the app at the same time