File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed
lib/java/com/google/android/material/progressindicator Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -548,7 +548,6 @@ public int getTrackThickness() {
548548 public void setTrackThickness (@ Px int trackThickness ) {
549549 if (spec .trackThickness != trackThickness ) {
550550 spec .trackThickness = trackThickness ;
551- spec .trackCornerRadius = min (spec .trackCornerRadius , spec .trackThickness / 2 );
552551 requestLayout ();
553552 }
554553 }
Original file line number Diff line number Diff line change @@ -109,7 +109,8 @@ void adjustCanvas(
109109 // These are used when drawing the indicator and track.
110110 useStrokeCap = spec .trackThickness / 2 <= spec .trackCornerRadius ;
111111 displayedTrackThickness = spec .trackThickness * trackThicknessFraction ;
112- displayedCornerRadius = spec .trackCornerRadius * trackThicknessFraction ;
112+ displayedCornerRadius =
113+ min (spec .trackThickness / 2 , spec .trackCornerRadius ) * trackThicknessFraction ;
113114 adjustedRadius = (spec .indicatorSize - spec .trackThickness ) / 2f ;
114115 if ((isShowing && spec .showAnimationBehavior == CircularProgressIndicator .SHOW_INWARD )
115116 || (isHiding && spec .hideAnimationBehavior == CircularProgressIndicator .HIDE_OUTWARD )) {
Original file line number Diff line number Diff line change @@ -113,7 +113,8 @@ void adjustCanvas(
113113
114114 // These are set for the drawing the indicator and track.
115115 displayedTrackThickness = spec .trackThickness * trackThicknessFraction ;
116- displayedCornerRadius = spec .trackCornerRadius * trackThicknessFraction ;
116+ displayedCornerRadius =
117+ min (spec .trackThickness / 2 , spec .trackCornerRadius ) * trackThicknessFraction ;
117118
118119 // Clips all drawing to the track area, so it doesn't draw outside of its bounds (which can
119120 // happen in certain configurations of clipToPadding and clipChildren)
You can’t perform that action at this time.
0 commit comments