Do not apply max-sizes if size/radius is not specified on rectangular…

…/round buttons, see #889
phetsims · Aug 1, 2024 · d0b47bc · d0b47bc
1 parent 43ac9f1
commit d0b47bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/js/buttons/RectangularButton.ts b/js/buttons/RectangularButton.ts
@@ -495,11 +495,14 @@ class RectangularButtonNodeConstraint extends LayoutConstraint {
       contentProxy.preferredWidth = preferredContentWidth;
       contentProxy.preferredHeight = preferredContentHeight;
 
-      const contentContainer = this.buttonNode.contentContainer!;
-      assert && assert( contentContainer );
+      // Only apply max sizes if a size is specified in the button, see https://github.com/phetsims/sun/issues/889
+      if ( this.options.size ) {
+        const contentContainer = this.buttonNode.contentContainer!;
+        assert && assert( contentContainer );
 
-      contentContainer.maxWidth = preferredContentWidth;
-      contentContainer.maxHeight = preferredContentHeight;
+        contentContainer.maxWidth = preferredContentWidth;
+        contentContainer.maxHeight = preferredContentHeight;
+      }
     }
 
     this.isFirstLayout = false;

diff --git a/js/buttons/RoundButton.ts b/js/buttons/RoundButton.ts
@@ -430,11 +430,14 @@ class RoundButtonNodeConstraint extends LayoutConstraint {
       contentProxy.preferredWidth = preferredContentWidth;
       contentProxy.preferredHeight = preferredContentHeight;
 
-      const contentContainer = this.buttonNode.contentContainer!;
-      assert && assert( contentContainer );
+      // Only apply max sizes if a size is specified in the button, see https://github.com/phetsims/sun/issues/889
+      if ( this.options.radius !== null ) {
+        const contentContainer = this.buttonNode.contentContainer!;
+        assert && assert( contentContainer );
 
-      contentContainer.maxWidth = preferredContentWidth;
-      contentContainer.maxHeight = preferredContentHeight;
+        contentContainer.maxWidth = preferredContentWidth;
+        contentContainer.maxHeight = preferredContentHeight;
+      }
     }
 
     this.isFirstLayout = false;