diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index c3a3ebbb..c862d551 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/electromechanical/CliffJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java index cab17aef..ca1b2c92 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java @@ -197,7 +197,7 @@ public class CliffJack1_4 extends AbstractTransparentComponent { Shape[] body = getBody(); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); - if (componentState != ComponentState.DRAGGING) { +// if (componentState != ComponentState.DRAGGING) { Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); @@ -210,7 +210,7 @@ public class CliffJack1_4 extends AbstractTransparentComponent { g2d.fill(body[i]); } g2d.setComposite(oldComposite); - } +// } Color finalBorderColor; Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java index 8702a4a3..4168be66 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java @@ -216,7 +216,7 @@ public class ClosedJack1_4 extends AbstractTransparentComponent { // Rectangle bounds = body.getBounds(); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); - if (componentState != ComponentState.DRAGGING) { +// if (componentState != ComponentState.DRAGGING) { Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); @@ -228,7 +228,7 @@ public class ClosedJack1_4 extends AbstractTransparentComponent { g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : METAL_COLOR); g2d.fill(body[3]); g2d.setComposite(oldComposite); - } +// } Color finalBorderColor; if (outlineMode) { diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java index 96dec254..762ef6bc 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java @@ -88,7 +88,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent { Shape[] body = getBody(); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); - if (componentState != ComponentState.DRAGGING) { +// if (componentState != ComponentState.DRAGGING) { Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); @@ -97,7 +97,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent { g2d.fill(body[0]); g2d.setComposite(oldComposite); - } +// } Color finalBorderColor; @@ -116,8 +116,8 @@ public class OpenJack1_4 extends AbstractTransparentComponent { g2d.setColor(finalBorderColor); g2d.draw(body[0]); - if (componentState != ComponentState.DRAGGING) { - Composite oldComposite = g2d.getComposite(); +// if (componentState != ComponentState.DRAGGING) { + oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); } @@ -131,7 +131,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent { drawingObserver.stopTrackingContinuityArea(); g2d.setComposite(oldComposite); - } +// } if (outlineMode) { Theme theme = @@ -361,7 +361,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent { @Override public boolean isControlPointSticky(int index) { - return index < 3 || getType() == JackType.STEREO; + return index < 2 || getType() == JackType.STEREO; } @Override diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java index 47e5656b..eb14a00e 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java @@ -94,7 +94,7 @@ public class PilotLampHolder extends AbstractTransparentComponent { Shape[] body = getBody(); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); - if (componentState != ComponentState.DRAGGING) { +// if (componentState != ComponentState.DRAGGING) { Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); @@ -103,7 +103,7 @@ public class PilotLampHolder extends AbstractTransparentComponent { g2d.fill(body[0]); g2d.setComposite(oldComposite); - } +// } Color finalBorderColor; @@ -122,8 +122,8 @@ public class PilotLampHolder extends AbstractTransparentComponent { g2d.setColor(finalBorderColor); g2d.draw(body[0]); - if (componentState != ComponentState.DRAGGING) { - Composite oldComposite = g2d.getComposite(); +// if (componentState != ComponentState.DRAGGING) { + oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); } @@ -141,7 +141,7 @@ public class PilotLampHolder extends AbstractTransparentComponent { drawingObserver.stopTrackingContinuityArea(); g2d.setComposite(oldComposite); - } +// } if (outlineMode) { Theme theme = diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java index 6f720cb2..a1120443 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java @@ -133,7 +133,7 @@ public class PlasticDCJack extends AbstractTransparentComponent { Shape[] body = getBody(); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); - if (componentState != ComponentState.DRAGGING) { +// if (componentState != ComponentState.DRAGGING) { Composite oldComposite = g2d.getComposite(); if (alpha < MAX_ALPHA) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); @@ -145,7 +145,7 @@ public class PlasticDCJack extends AbstractTransparentComponent { g2d.fill(body[1]); } g2d.setComposite(oldComposite); - } +// } Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); Color finalBorderColor; diff --git a/diylc/diylc-swing/install.iss b/diylc/diylc-swing/install.iss index ec49abe4..245cb503 100644 --- a/diylc/diylc-swing/install.iss +++ b/diylc/diylc-swing/install.iss @@ -14,7 +14,6 @@ AlwaysShowDirOnReadyPage=yes [Files] Source: "diylc.exe"; DestDir: "{app}" Source: "diylc.l4j.ini"; DestDir: "{app}" -Source: "config.xml"; DestDir: "{app}" Source: "update.xml"; DestDir: "{app}" Source: "variants.xml"; DestDir: "{app}" Source: "config.properties"; DestDir: "{app}" diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index c3a3ebbb..c862d551 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 6c54248b..ccfbe2bd 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 67a73fa9..3ff9dcd2 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -2302,6 +2302,10 @@ IMPROVEMENT Chrome-style cursors for mouse scrolling with arrows showing the exact scrolling direction + + IMPROVEMENT + Do not render various jack components as completely transparent while dragging + BUG_FIX Since 3.49, straight traces are rendered 1px thinner than curved traces of the same thickness