#Buttons Fix clampToMinimumSize method.

codeman7 · material-automation · commit 4badc9d69100 · 2025-04-30T18:42:14.000-07:00
PiperOrigin-RevId: 753390858
diff --git a/components/M3CButton/src/M3CButton.m b/components/M3CButton/src/M3CButton.m
@@ -610,10 +610,13 @@ - (void)setCapsuleCornersBasedOn:(CGSize)size {
 }
 
 - (CGSize)clampToMinimumSize:(CGSize)size {
-  if (size.height < _minimumHeight) {
-    size.height = _minimumHeight;
+  size.height = MAX(size.height, _minimumHeight);
+
+  if (_buttonSizeSet) {
+    size.width = MAX(size.width, _minimumWidth);
+  } else {
+    size.width = MAX(MAX(size.height, size.width), _minimumWidth);
   }
-  size.width = MAX(MAX(size.height, size.width), _minimumWidth);
   return size;
 }
 #pragma mark - Enabling multi-line layout

Original file line number	Diff line number	Diff line change
`@@ -610,10 +610,13 @@ - (void)setCapsuleCornersBasedOn:(CGSize)size {`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`- (CGSize)clampToMinimumSize:(CGSize)size {`
`613`		`- if (size.height < _minimumHeight) {`
`614`		`- size.height = _minimumHeight;`
	`613`	`+ size.height = MAX(size.height, _minimumHeight);`
	`614`	`+`
	`615`	`+ if (_buttonSizeSet) {`
	`616`	`+ size.width = MAX(size.width, _minimumWidth);`
	`617`	`+ } else {`
	`618`	`+ size.width = MAX(MAX(size.height, size.width), _minimumWidth);`
`615`	`619`	`}`
`616`		`- size.width = MAX(MAX(size.height, size.width), _minimumWidth);`
`617`	`620`	`return size;`
`618`	`621`	`}`
`619`	`622`	`#pragma mark - Enabling multi-line layout`