#Button Fix issue where legacy clients can't set borderWidth.

codeman7 · material-automation · commit a801760a5838 · 2025-04-25T10:36:35.000-07:00
PiperOrigin-RevId: 751476068
diff --git a/components/M3CButton/src/M3CButton.m b/components/M3CButton/src/M3CButton.m
@@ -452,11 +452,18 @@ - (void)updateInsets {
 }
 
 - (void)setBorderWidth:(CGFloat)borderWidth {
-  self.visualBackground.layer.borderWidth = borderWidth;
+  if (_buttonSizeSet) {
+    self.visualBackground.layer.borderWidth = borderWidth;
+  } else {
+    self.layer.borderWidth = borderWidth;
+  }
 }
 
 - (CGFloat)borderWidth {
-  return self.visualBackground.layer.borderWidth;
+  if (_buttonSizeSet) {
+    return self.visualBackground.layer.borderWidth;
+  }
+  return self.layer.borderWidth;
 }
 
 - (void)setTextCanWrap:(BOOL)textCanWrap {

Original file line number	Diff line number	Diff line change
`@@ -452,11 +452,18 @@ - (void)updateInsets {`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`- (void)setBorderWidth:(CGFloat)borderWidth {`
`455`		`- self.visualBackground.layer.borderWidth = borderWidth;`
	`455`	`+ if (_buttonSizeSet) {`
	`456`	`+ self.visualBackground.layer.borderWidth = borderWidth;`
	`457`	`+ } else {`
	`458`	`+ self.layer.borderWidth = borderWidth;`
	`459`	`+ }`
`456`	`460`	`}`
`457`	`461`
`458`	`462`	`- (CGFloat)borderWidth {`
`459`		`- return self.visualBackground.layer.borderWidth;`
	`463`	`+ if (_buttonSizeSet) {`
	`464`	`+ return self.visualBackground.layer.borderWidth;`
	`465`	`+ }`
	`466`	`+ return self.layer.borderWidth;`
`460`	`467`	`}`
`461`	`468`
`462`	`469`	`- (void)setTextCanWrap:(BOOL)textCanWrap {`