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

Merge branch 'master' of

Browse Source 
https://github.com/bancika/diy-layout-creator.git

Conflicts:
	diylc/diylc-library/lib/diylc-core.jar
	diylc/diylc-swing/lib/diylc-core.jar
This commit is contained in:
Branislav Stojkovic
2017-05-06 12:19:42 +02:00
parent b745ae8e15 2a72c8380c
commit 08882a5167
12 changed files with 66 additions and 9 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/MiniToggleSwitch.java
+30 -5
View File
@@ -51,6 +51,9 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
private OrientationHV orientation = OrientationHV.VERTICAL;
private Size spacing = SPACING;
private Color bodyColor = BODY_COLOR;
private Color borderColor = BORDER_COLOR;
public MiniToggleSwitch() {
super();
updateControlPoints();
@@ -189,15 +192,15 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
// Reset body shape.
body = null;
}
@EditableProperty
public Size getSpacing() {
if (spacing == null) {
spacing = SPACING;
spacing = SPACING;
}
return spacing;
}
public void setSpacing(Size spacing) {
this.spacing = spacing;
updateControlPoints();
@@ -217,7 +220,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
g2d.fill(body);
g2d.setComposite(oldComposite);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
@@ -229,7 +232,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
} else {
finalBorderColor =
componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
: BORDER_COLOR;
: getBorderColor();
}
g2d.setColor(finalBorderColor);
g2d.draw(body);
@@ -315,4 +318,26 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
- 1);
}
}
@EditableProperty(name = "Body")
public Color getBodyColor() {
if (bodyColor == null)
bodyColor = BODY_COLOR;
return bodyColor;
}
public void setBodyColor(Color bodyColor) {
this.bodyColor = bodyColor;
}
@EditableProperty(name = "Border")
public Color getBorderColor() {
if (borderColor == null)
borderColor = BORDER_COLOR;
return borderColor;
}
public void setBorderColor(Color borderColor) {
this.borderColor = borderColor;
}
}