center alignment should take padding into account

AbeGellis · Mar 12, 2023 · f8ef78f · f8ef78f
1 parent 80806da
commit f8ef78f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/haxe/ui/layouts/DefaultLayout.hx b/haxe/ui/layouts/DefaultLayout.hx
@@ -145,6 +145,8 @@ class DefaultLayout extends Layout {
     }
 
     private override function repositionChildren() {
+        var usableSize = this.usableSize;
+
         for (child in component.childComponents) {
             if (child.includeInLayout == false) {
                 continue;
@@ -155,7 +157,7 @@ class DefaultLayout extends Layout {
 
             switch (horizontalAlign(child)) {
                 case "center":
-                    xpos = ((component.componentWidth - child.componentWidth) / 2) + marginLeft(child) - marginRight(child);
+                    xpos = ((usableSize.width - child.componentWidth) / 2) + paddingLeft + marginLeft(child) - marginRight(child);
                 case "right":
                     xpos = component.componentWidth - (child.componentWidth + paddingRight + marginRight(child));
                 default:    //left
@@ -164,7 +166,7 @@ class DefaultLayout extends Layout {
 
             switch (verticalAlign(child)) {
                 case "center":
-                    ypos = ((component.componentHeight - child.componentHeight) / 2) + marginTop(child) - marginBottom(child);
+                    ypos = ((usableSize.height - child.componentHeight) / 2) + paddingTop + marginTop(child) - marginBottom(child);
                 case "bottom":
                     ypos = component.componentHeight - (child.componentHeight + paddingBottom + marginBottom(child));
                 default:    //top

diff --git a/haxe/ui/layouts/HorizontalLayout.hx b/haxe/ui/layouts/HorizontalLayout.hx
@@ -11,7 +11,8 @@ class HorizontalLayout extends DefaultLayout {
 
     private override function repositionChildren() {
         var xpos = paddingLeft;
-
+        var usableSize = this.usableSize;
+
         for (child in component.childComponents) {
             if (child.includeInLayout == false) {
                 continue;
@@ -21,7 +22,7 @@ class HorizontalLayout extends DefaultLayout {
 
             switch (verticalAlign(child)) {
                 case "center":
-                    ypos = ((component.componentHeight - child.componentHeight) / 2) + marginTop(child) - marginBottom(child);
+                    ypos = ((usableSize.height - child.componentHeight) / 2) + paddingTop + marginTop(child) - marginBottom(child);
                 case "bottom":
                     if (child.componentHeight < component.componentHeight) {
                         ypos = component.componentHeight - (child.componentHeight + paddingBottom + marginTop(child));

diff --git a/haxe/ui/layouts/VerticalLayout.hx b/haxe/ui/layouts/VerticalLayout.hx
@@ -10,6 +10,7 @@ class VerticalLayout extends DefaultLayout {
 
     private override function repositionChildren() {
         var ypos = paddingTop;
+        var usableSize = this.usableSize;
 
         for (child in component.childComponents) {
             if (child.includeInLayout == false) {
@@ -20,7 +21,7 @@ class VerticalLayout extends DefaultLayout {
 
             switch (horizontalAlign(child)) {
                 case "center":
-                    xpos = ((component.componentWidth - child.componentWidth) / 2) + marginLeft(child) - marginRight(child);
+                    xpos = ((usableSize.width - child.componentWidth) / 2) + paddingLeft + marginLeft(child) - marginRight(child);
                 case "right":
                     if (child.componentWidth < component.componentWidth) {
                         xpos = component.componentWidth - (child.componentWidth + paddingRight + marginLeft(child));