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

v1 pot and label import bug

Browse Source
This commit is contained in:
bancika
2012-08-30 09:38:15 +00:00
parent 6068619c43
commit e115f87f65
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/diylc-library/build.xml
+3
View File
@@ -49,6 +49,9 @@
<copy todir="../diylc-swing/library" overwrite="true">
<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
</copy>
<copy todir="../diylc-core/library" overwrite="true">
<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
</copy>
</target>
<target name="javadoc">
diy-layout-creator --username bancika@gmail.com/diylc-library/src/org/diylc/components/misc/Label.java
+14 -17
View File
@@ -7,6 +7,8 @@ import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.geom.Rectangle2D;
import org.diylc.common.HorizontalAlignment;
import org.diylc.common.VerticalAlignment;
import org.diylc.components.AbstractComponent;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -30,8 +32,8 @@ public class Label extends AbstractComponent<Void> {
private Color color = LABEL_COLOR;
@Deprecated
private boolean center;
private HorizontalAlignment horizontalAlignment = HorizontalAlignment.Center;
private VerticalAlignment verticalAlignment = VerticalAlignment.Center;
private HorizontalAlignment horizontalAlignment = HorizontalAlignment.CENTER;
private VerticalAlignment verticalAlignment = VerticalAlignment.CENTER;
@Override
public void draw(Graphics2D g2d, ComponentState componentState,
@@ -50,13 +52,13 @@ public class Label extends AbstractComponent<Void> {
int x = point.x;
int y = point.y;
switch (verticalAlignment) {
case Center:
case CENTER:
y = point.y - textHeight / 2 + fontMetrics.getAscent();
break;
case Top:
case TOP:
y = point.y - textHeight + fontMetrics.getAscent();
break;
case Bottom:
case BOTTOM:
y = point.y + fontMetrics.getAscent();
break;
default:
@@ -64,13 +66,13 @@ public class Label extends AbstractComponent<Void> {
+ verticalAlignment);
}
switch (horizontalAlignment) {
case Center:
case CENTER:
x = point.x - textWidth / 2;
break;
case Left:
case LEFT:
x = point.x;
break;
case Right:
case RIGHT:
x = point.x - textWidth;
break;
default:
@@ -212,13 +214,16 @@ public class Label extends AbstractComponent<Void> {
}
public void setVerticalAlignment(VerticalAlignment verticalAlignment) {
if (verticalAlignment == null) {
verticalAlignment = VerticalAlignment.CENTER;
}
this.verticalAlignment = verticalAlignment;
}
@EditableProperty(name = "Horizontal alignment")
public HorizontalAlignment getHorizontalAlignment() {
if (horizontalAlignment == null) {
horizontalAlignment = HorizontalAlignment.Center;
horizontalAlignment = HorizontalAlignment.CENTER;
}
return horizontalAlignment;
}
@@ -240,12 +245,4 @@ public class Label extends AbstractComponent<Void> {
@Override
public void setValue(Void value) {
}
public enum HorizontalAlignment {
Left, Center, Right;
}
public enum VerticalAlignment {
Top, Center, Bottom;
}
}