Merge pull request #13724 from carolhmj/GUIFixIdealWidthHeightCalcs

Round up ideal width/height calculations so no control is cut off
BabylonJS · Apr 11, 2023 · 828ee43 · 828ee43
2 parents aa22ae4 + 8b5a68a
commit 828ee43
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -350,6 +350,22 @@
             // "envFile": "${workspaceRoot}/.env",
             "preLaunchTask": "CDN Serve (Dev)"
         },
+        {
+            /*
+            Launch tests
+            https://jestjs.io/docs/troubleshooting#debugging-in-vs-code
+            */
+            "type": "node",
+            "request": "launch",
+            "name": "Update single validation test - WebGL2 (Dev)",
+            "runtimeArgs": ["--inspect-brk", "${workspaceRoot}/node_modules/jest/bin/jest.js", "--runInBand", "--selectProjects", "visualization", "-i", "webgl2", "-t", "${input:testName}" , "-u"],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen",
+            "port": 9229,
+            // "outFiles": ["${workspaceRoot}/**/dist/**/*"], // debugging sources
+            // "envFile": "${workspaceRoot}/.env",
+            "preLaunchTask": "CDN Serve (Dev)"
+        },
         {
             /*
             Launch tests

diff --git a/packages/dev/gui/src/2D/valueAndUnit.ts b/packages/dev/gui/src/2D/valueAndUnit.ts
@@ -124,11 +124,11 @@ export class ValueAndUnit {
             let height: number = 0;
 
             if (host.idealWidth) {
-                width = (this._value * host.getSize().width) / host.idealWidth;
+                width = Math.ceil((this._value * host.getSize().width) / host.idealWidth);
             }
 
             if (host.idealHeight) {
-                height = (this._value * host.getSize().height) / host.idealHeight;
+                height = Math.ceil((this._value * host.getSize().height) / host.idealHeight);
             }
 
             if (host.useSmallestIdeal && host.idealWidth && host.idealHeight) {

diff --git a/...visualization/ReferenceImages/Rounding values on controls inside StackPanel.png b/...visualization/ReferenceImages/Rounding values on controls inside StackPanel.png
diff --git a/packages/tools/tests/test/visualization/config.json b/packages/tools/tests/test/visualization/config.json
@@ -1598,6 +1598,10 @@
             "title": "Sprites Pixel Perfect",
             "playgroundId": "#ZX8DJ3#10",
             "excludedEngines": ["webgl1"]
+        },
+        {
+            "title": "Rounding values on controls inside StackPanel",
+            "playgroundId": "#XCPP9Y#18325"
         }
     ]
 }