Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e03999c authored by Mike Reed's avatar Mike Reed
Browse files

if we have a single value for roundrect radius, manually clamp it before drawing. 

Skia will clamp the radius independently in X and Y to ensure it is not larger than 1/2 the width (or height).
If the caller to our drawable gives us a single value, we'll assume they want it to be circular, and not an oval.
To do that, we clamp it up front, so we get (possibly smaller) circular corners, rather than potentially
elliptical ones.

This makes the progress bar look "nicer" when it is very thin in one dimension.
parent f993fefc

graphics/java/android/graphics/drawable/GradientDrawable.java

+9 −0
Original line number Diff line number Diff line
@@ -319,7 +319,16 @@ public class GradientDrawable extends Drawable { 
                    }

                }

                else {

                    // since the caller is only giving us 1 value, we will force

                    // it to be square if the rect is too small in one dimension

                    // to show it. If we did nothing, Skia would clamp the rad

                    // independently along each axis, giving us a thin ellips

                    // if the rect were very wide but not very tall

                    float rad = st.mRadius;

                    float r = Math.min(mRect.width(), mRect.height()) * 0.5f;

                    if (rad > r) {

                        rad = r;

                    }

                    canvas.drawRoundRect(mRect, rad, rad, mFillPaint);

                    if (haveStroke) {

                        canvas.drawRoundRect(mRect, rad, rad, mStrokePaint);