diff --git a/src/main/haxework/view/layout/DefaultLayout.hx b/src/main/haxework/view/layout/DefaultLayout.hx index 9efded3..2a90c67 100755 --- a/src/main/haxework/view/layout/DefaultLayout.hx +++ b/src/main/haxework/view/layout/DefaultLayout.hx @@ -35,16 +35,18 @@ class DefaultLayout extends Layout { }, "group" ); - switch group.overflow.x { + var ox = switch group.overflow.x { case SCROLL: - group.overflowX = width / (group.width - group.geometry.padding.horizontal); - case _: + width / (group.width - group.geometry.padding.horizontal); + case _: 1; } - switch group.overflow.y { + group.overflowX = ox; + var oy = switch group.overflow.y { case SCROLL: - group.overflowY = height / (group.height - group.geometry.padding.vertical); - case _: + height / (group.height - group.geometry.padding.vertical); + case _: 1; } + group.overflowY = oy; } private function filterViews(group:IGroupView, views:Array>):Array> { diff --git a/src/main/haxework/view/layout/TailLayout.hx b/src/main/haxework/view/layout/TailLayout.hx index 6bef41b..952a951 100644 --- a/src/main/haxework/view/layout/TailLayout.hx +++ b/src/main/haxework/view/layout/TailLayout.hx @@ -17,11 +17,12 @@ class TailLayout extends DefaultLayout { var x:Float = (group.width - row.width) / 2; for (v in row.views) { v.x = x; - v.y = switch group.layout.vAlign { + var vy = switch group.layout.vAlign { case TOP | NONE: y; case MIDDLE: y + (row.height - v.height) / 2; case BOTTOM: y + (row.height - v.height); } + v.y = vy; x += v.width + margin; } }