correct width and heigth calculation regarding to scrollbars (#742)

HtmlUnit · May 16, 2024 · da8a450 · da8a450
1 parent 94684a9
commit da8a450
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/org/htmlunit/css/ComputedCssStyleDeclaration.java b/src/main/java/org/htmlunit/css/ComputedCssStyleDeclaration.java
@@ -1404,7 +1404,7 @@ public int getCalculatedHeight(final boolean includeBorder, final boolean includ
             if (includeBorder) {
                 height += getBorderVertical();
             }
-            else if (isScrollable(false, true) && !(element instanceof HtmlBody)) {
+            else if (isScrollable(true, true) && !(element instanceof HtmlBody)) {
                 height -= 17;
             }
 
@@ -1460,7 +1460,7 @@ public int getCalculatedWidth(final boolean includeBorder, final boolean include
             if (includeBorder) {
                 width += getBorderHorizontal();
             }
-            else if (isScrollable(true, true) && !(element instanceof HtmlBody)) {
+            else if (isScrollable(false, true) && !(element instanceof HtmlBody)) {
                 width -= 17;
             }
 
@@ -1896,9 +1896,9 @@ private boolean isScrollable(final boolean horizontal, final boolean ignoreSize)
 
         String overflow;
         if (horizontal) {
-            overflow = getStyleAttribute(Definition.OVERFLOW_Y_, false);
+            overflow = getStyleAttribute(Definition.OVERFLOW_X_, false);
             if (StringUtils.isEmpty(overflow)) {
-                overflow = getStyleAttribute(Definition.OVERFLOW_Y, false);
+                overflow = getStyleAttribute(Definition.OVERFLOW_X, false);
             }
             // fall back to default
             if (StringUtils.isEmpty(overflow)) {
@@ -1908,9 +1908,9 @@ private boolean isScrollable(final boolean horizontal, final boolean ignoreSize)
                 && (ignoreSize || getContentWidth() > getCalculatedWidth());
         }
         else {
-            overflow = getStyleAttribute(Definition.OVERFLOW_X_, false);
+            overflow = getStyleAttribute(Definition.OVERFLOW_Y_, false);
             if (StringUtils.isEmpty(overflow)) {
-                overflow = getStyleAttribute(Definition.OVERFLOW_X, false);
+                overflow = getStyleAttribute(Definition.OVERFLOW_Y, false);
             }
             // fall back to default
             if (StringUtils.isEmpty(overflow)) {