BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Do not render various jack components as completely transparent while

Browse Source 
dragging
This commit is contained in:
Branislav Stojkovic
2019-01-23 10:53:00 +01:00
parent ef5bde9091
commit 5c9754baf4
10 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java
+2 -2
View File
@@ -197,7 +197,7 @@ public class CliffJack1_4 extends AbstractTransparentComponent<String> {
Shape[] body = getBody(); Shape[] body = getBody();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
@@ -210,7 +210,7 @@ public class CliffJack1_4 extends AbstractTransparentComponent<String> {
g2d.fill(body[i]); g2d.fill(body[i]);
} }
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
Color finalBorderColor; Color finalBorderColor;
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java
+2 -2
View File
@@ -216,7 +216,7 @@ public class ClosedJack1_4 extends AbstractTransparentComponent<String> {
// Rectangle bounds = body.getBounds(); // Rectangle bounds = body.getBounds();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
@@ -228,7 +228,7 @@ public class ClosedJack1_4 extends AbstractTransparentComponent<String> {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : METAL_COLOR); g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : METAL_COLOR);
g2d.fill(body[3]); g2d.fill(body[3]);
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
Color finalBorderColor; Color finalBorderColor;
if (outlineMode) { if (outlineMode) {
diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java
+6 -6
View File
@@ -88,7 +88,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent<String> {
Shape[] body = getBody(); Shape[] body = getBody();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
@@ -97,7 +97,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent<String> {
g2d.fill(body[0]); g2d.fill(body[0]);
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
Color finalBorderColor; Color finalBorderColor;
@@ -116,8 +116,8 @@ public class OpenJack1_4 extends AbstractTransparentComponent<String> {
g2d.setColor(finalBorderColor); g2d.setColor(finalBorderColor);
g2d.draw(body[0]); g2d.draw(body[0]);
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
} }
@@ -131,7 +131,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent<String> {
drawingObserver.stopTrackingContinuityArea(); drawingObserver.stopTrackingContinuityArea();
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
if (outlineMode) { if (outlineMode) {
Theme theme = Theme theme =
@@ -361,7 +361,7 @@ public class OpenJack1_4 extends AbstractTransparentComponent<String> {
@Override @Override
public boolean isControlPointSticky(int index) { public boolean isControlPointSticky(int index) {
return index < 3 || getType() == JackType.STEREO; return index < 2 || getType() == JackType.STEREO;
} }
@Override @Override
diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java
+5 -5
View File
@@ -94,7 +94,7 @@ public class PilotLampHolder extends AbstractTransparentComponent<String> {
Shape[] body = getBody(); Shape[] body = getBody();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
@@ -103,7 +103,7 @@ public class PilotLampHolder extends AbstractTransparentComponent<String> {
g2d.fill(body[0]); g2d.fill(body[0]);
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
Color finalBorderColor; Color finalBorderColor;
@@ -122,8 +122,8 @@ public class PilotLampHolder extends AbstractTransparentComponent<String> {
g2d.setColor(finalBorderColor); g2d.setColor(finalBorderColor);
g2d.draw(body[0]); g2d.draw(body[0]);
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
} }
@@ -141,7 +141,7 @@ public class PilotLampHolder extends AbstractTransparentComponent<String> {
drawingObserver.stopTrackingContinuityArea(); drawingObserver.stopTrackingContinuityArea();
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
if (outlineMode) { if (outlineMode) {
Theme theme = Theme theme =
diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java
+2 -2
View File
@@ -133,7 +133,7 @@ public class PlasticDCJack extends AbstractTransparentComponent<String> {
Shape[] body = getBody(); Shape[] body = getBody();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
if (componentState != ComponentState.DRAGGING) { // if (componentState != ComponentState.DRAGGING) {
Composite oldComposite = g2d.getComposite(); Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) { if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA)); g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
@@ -145,7 +145,7 @@ public class PlasticDCJack extends AbstractTransparentComponent<String> {
g2d.fill(body[1]); g2d.fill(body[1]);
} }
g2d.setComposite(oldComposite); g2d.setComposite(oldComposite);
} // }
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME); Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
Color finalBorderColor; Color finalBorderColor;
diylc/diylc-swing/install.iss
-1
View File
@@ -14,7 +14,6 @@ AlwaysShowDirOnReadyPage=yes
[Files] [Files]
Source: "diylc.exe"; DestDir: "{app}" Source: "diylc.exe"; DestDir: "{app}"
Source: "diylc.l4j.ini"; DestDir: "{app}" Source: "diylc.l4j.ini"; DestDir: "{app}"
Source: "config.xml"; DestDir: "{app}"
Source: "update.xml"; DestDir: "{app}" Source: "update.xml"; DestDir: "{app}"
Source: "variants.xml"; DestDir: "{app}" Source: "variants.xml"; DestDir: "{app}"
Source: "config.properties"; DestDir: "{app}" Source: "config.properties"; DestDir: "{app}"
diylc/diylc-swing/lib/diylc-core.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/update.xml
+4
View File
@@ -2302,6 +2302,10 @@
<changeType>IMPROVEMENT</changeType> <changeType>IMPROVEMENT</changeType>
<description>Chrome-style cursors for mouse scrolling with arrows showing the exact scrolling direction</description> <description>Chrome-style cursors for mouse scrolling with arrows showing the exact scrolling direction</description>
</org.diylc.appframework.update.Change> </org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Do not render various jack components as completely transparent while dragging</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change> <org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType> <changeType>BUG_FIX</changeType>
<description>Since 3.49, straight traces are rendered 1px thinner than curved traces of the same thickness</description> <description>Since 3.49, straight traces are rendered 1px thinner than curved traces of the same thickness</description>