Fix Align / Valign location clamping

gurkenlabs · Mar 4, 2025 · cee53ea · cee53ea
1 parent 899016e
commit cee53ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/litiengine/src/main/java/de/gurkenlabs/litiengine/Align.java b/litiengine/src/main/java/de/gurkenlabs/litiengine/Align.java
@@ -130,7 +130,7 @@ public double getLocation(final double width, final double objectWidth, final bo
       return location;
     }
 
-    return Math.clamp(location, 0, width - objectWidth);
+    return Math.max(0, Math.min(width - objectWidth, location));
   }
 
   /**

diff --git a/litiengine/src/main/java/de/gurkenlabs/litiengine/Valign.java b/litiengine/src/main/java/de/gurkenlabs/litiengine/Valign.java
@@ -112,7 +112,7 @@ public double getLocation(final double height, final double objectHeight, final
       return location;
     }
 
-    return Math.clamp(location, 0, height - objectHeight);
+    return Math.max(0, Math.min(height - objectHeight, location));
   }
 
   /**

diff --git a/litiengine/src/test/java/de/gurkenlabs/litiengine/AlignTests.java b/litiengine/src/test/java/de/gurkenlabs/litiengine/AlignTests.java
@@ -9,7 +9,7 @@ class AlignTests {
   private Align alignObject;
 
   @BeforeEach
-  public void initAlign() {
+  void initAlign() {
     alignObject = Align.get("right"); // portion = 1
   }
-Original file line number
+Diff line change
@@ Expand Up @@
           return location;
         }
-        return Math.clamp(location, 0, width - objectWidth);
+        return Math.max(0, Math.min(width - objectWidth, location));
       }
       /**
@@ Expand Down @@