diff --git a/haxework/gui/core/HAlign.hx b/haxework/gui/core/HAlign.hx index 4452fd7..cb86638 100755 --- a/haxework/gui/core/HAlign.hx +++ b/haxework/gui/core/HAlign.hx @@ -1,8 +1,8 @@ package haxework.gui.core; -@:fakeEnum(String) enum HAlign { - NONE; - LEFT; - CENTER; - RIGHT; +@:enum abstract HAlign(String) { + var NONE = "NONE"; + var LEFT = "LEFT"; + var CENTER = "CENTER"; + var RIGHT = "RIGHT"; } \ No newline at end of file diff --git a/haxework/gui/core/VAlign.hx b/haxework/gui/core/VAlign.hx index 95367b9..99d9765 100755 --- a/haxework/gui/core/VAlign.hx +++ b/haxework/gui/core/VAlign.hx @@ -1,8 +1,8 @@ package haxework.gui.core; -@:fakeEnum(String) enum VAlign { - NONE; - TOP; - MIDDLE; - BOTTOM; +@:enum abstract VAlign(String) { + var NONE = "NONE"; + var TOP = "TOP"; + var MIDDLE = "MIDDLE"; + var BOTTOM = "BOTTOM"; } \ No newline at end of file diff --git a/haxework/gui/layout/HorizontalLayout.hx b/haxework/gui/layout/HorizontalLayout.hx index d596f07..7eea315 100755 --- a/haxework/gui/layout/HorizontalLayout.hx +++ b/haxework/gui/layout/HorizontalLayout.hx @@ -45,6 +45,7 @@ class HorizontalLayout extends DefaultLayout { case HAlign.LEFT: x = group.leftPadding; case HAlign.CENTER: x = (group.width - fixedSize) / 2 + group.leftPadding - group.rightPadding; case HAlign.RIGHT: x = group.width - fixedSize - group.rightPadding; + case _: } for (view in views) { diff --git a/haxework/gui/layout/VerticalLayout.hx b/haxework/gui/layout/VerticalLayout.hx index 7c0fc07..15a1af4 100755 --- a/haxework/gui/layout/VerticalLayout.hx +++ b/haxework/gui/layout/VerticalLayout.hx @@ -44,6 +44,7 @@ class VerticalLayout extends DefaultLayout { case VAlign.TOP: y = group.topPadding; case VAlign.MIDDLE: y = (group.height - fixedSize) / 2 + group.topPadding - group.bottomPadding; case VAlign.BOTTOM: y = group.height - fixedSize - group.bottomPadding; + case _: } for (view in views) { diff --git a/haxework/gui/utils/DrawUtil.hx b/haxework/gui/utils/DrawUtil.hx index 0be8346..b9df0eb 100755 --- a/haxework/gui/utils/DrawUtil.hx +++ b/haxework/gui/utils/DrawUtil.hx @@ -8,14 +8,14 @@ import flash.geom.Rectangle; import flash.display.BitmapData; import flash.display.Graphics; -@:fakeEnum(String) enum FillType { - NONE; - DEFAULT; - COVER; - CONTAIN; - REPEAT; - STRETCH; - NINEPATH; +@:enum abstract FillType(String) { + var NONE = "NONE"; + var DEFAULT = "DEFAULT"; + var COVER = "COVER"; + var CONTAIN = "CONTAIN"; + var REPEAT = "REPEAT"; + var STRETCH = "STRETCH"; + var NINEPATH = "NINEPATH"; } class DrawUtil { @@ -31,7 +31,6 @@ class DrawUtil { var m:Matrix = new Matrix(); var sx:Float = 1.0; var sy:Float = 1.0; - fillType = Type.createEnum(FillType, Std.string(fillType)); switch (fillType) { case FillType.REPEAT: graphics.beginBitmapFill(image, m, true, false);