InfernalGames/haxework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
shmyga
2019-07-22 23:25:18 +03:00
parent e2bda0fefa
commit f186b08e9f
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/haxework/view/layout/DefaultLayout.hx
View File

@@ -35,16 +35,18 @@ class DefaultLayout extends Layout {
}, },
"group" "group"
); );
switch group.overflow.x { var ox = switch group.overflow.x {
case SCROLL: case SCROLL:
group.overflowX = width / (group.width - group.geometry.padding.horizontal); width / (group.width - group.geometry.padding.horizontal);
case _: case _: 1;
} }
switch group.overflow.y { group.overflowX = ox;
var oy = switch group.overflow.y {
case SCROLL: case SCROLL:
group.overflowY = height / (group.height - group.geometry.padding.vertical); height / (group.height - group.geometry.padding.vertical);
case _: case _: 1;
} }
group.overflowY = oy;
} }
private function filterViews(group:IGroupView, views:Array<IView<Dynamic>>):Array<IView<Dynamic>> { private function filterViews(group:IGroupView, views:Array<IView<Dynamic>>):Array<IView<Dynamic>> {

3
src/main/haxework/view/layout/TailLayout.hx
View File

@@ -17,11 +17,12 @@ class TailLayout extends DefaultLayout {
var x:Float = (group.width - row.width) / 2; var x:Float = (group.width - row.width) / 2;
for (v in row.views) { for (v in row.views) {
v.x = x; v.x = x;
v.y = switch group.layout.vAlign { var vy = switch group.layout.vAlign {
case TOP | NONE: y; case TOP | NONE: y;
case MIDDLE: y + (row.height - v.height) / 2; case MIDDLE: y + (row.height - v.height) / 2;
case BOTTOM: y + (row.height - v.height); case BOTTOM: y + (row.height - v.height);
} }
v.y = vy;
x += v.width + margin; x += v.width + margin;
} }
} }