From 813baee504094e882c19f1fe720d01fa6961e832 Mon Sep 17 00:00:00 2001 From: Branislav Stojkovic Date: Fri, 18 Jan 2019 20:49:51 +0100 Subject: [PATCH] fix: straight traces are rendered 1px thinner than curved traces of the same thickness --- diylc/diylc-library/lib/diylc-core.jar | Bin 243535 -> 243532 bytes .../components/AbstractLeadedComponent.java | 39 +++++++++++------- diylc/diylc-swing/lib/diylc-core.jar | Bin 243535 -> 243532 bytes diylc/diylc-swing/library/main.jar | Bin 551617 -> 551648 bytes diylc/diylc-swing/update.xml | 4 ++ 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index acd545c8b20e93bcd4329c13accc567b1a9375b0..a40bd210ac3fe57bac1255103c75a66f5dc2ea6e 100644 GIT binary patch delta 9981 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 delta 10025 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 diff --git a/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java b/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java index d2f61b01..16b645f6 100644 --- a/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java +++ b/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java @@ -293,8 +293,16 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp private void drawLead(Graphics2D g2d, ComponentState componentState, IDrawingObserver observer, boolean isCopperArea) { if (isCopperArea) observer.startTrackingContinuityArea(true); - - float thickness = getLeadThickness() - 1; + + float thickness = getLeadThickness(); + + Line2D line = new Line2D.Double(points[0].x, points[0].y, points[1].x, points[1].y); + + if (shouldShadeLeads()) { + // for some reason the stroked line gets approx 1px thicker when converted to shape + thickness -= 1; + } + Stroke stroke = null; switch (getStyle()) { case SOLID: @@ -308,23 +316,24 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp stroke = ObjectCache.getInstance().fetchStroke(thickness, new float[] {thickness / 4, thickness * 4}, 0); break; } - - Line2D line = new Line2D.Double(points[0].x, points[0].y, points[1].x, points[1].y); - Shape lineShape = stroke.createStrokedShape(line); - Color leadColor = - shouldShadeLeads() ? getLeadColorForPainting(componentState) : getLeadColorForPainting(componentState); - g2d.setColor(leadColor); - g2d.fill(lineShape); - - if (isCopperArea) - observer.stopTrackingContinuityArea(); - - if (shouldShadeLeads()) { + if (shouldShadeLeads()) { + Shape lineShape = stroke.createStrokedShape(line); + + g2d.setColor(getLeadColorForPainting(componentState)); + g2d.fill(lineShape); + + if (isCopperArea) + observer.stopTrackingContinuityArea(); + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f)); leadColor = getLeadColorForPainting(componentState); g2d.setColor(leadColor.darker()); - g2d.draw(lineShape); + g2d.draw(lineShape); + } else { + g2d.setColor(getLeadColorForPainting(componentState)); + g2d.setStroke(stroke); + g2d.draw(line); } } diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index acd545c8b20e93bcd4329c13accc567b1a9375b0..a40bd210ac3fe57bac1255103c75a66f5dc2ea6e 100644 GIT binary patch delta 9981 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 delta 10025 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 diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 2c266d5a43079220ff4f40475cdc21144be6e0be..daa0e84228b1b59cbd06695e4ffbb02814df8b8c 100644 GIT binary patch delta 18451 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 d5!7R}1_fhv&%aF2KR*otG)T{wpsOg%{{Ut&m%0D| delta 18452 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 Chrome-style cursors for mouse scrolling with arrows showing the exact scrolling direction + + BUG_FIX + Since 3.49, straight traces are rendered 1px thinner than curved traces of the same thickness + https://github.com/bancika/diy-layout-creator/releases