From 0497c10d69a897ac43da16325d990702bcc5b4af Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 15 Aug 2019 13:20:09 -0700 Subject: [PATCH] Ensure mask covers non-circular emoji --- .../emojiApp/ui/qml/ProgressCircle/ProgressCircle.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/ProgressCircle/ProgressCircle.qml b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/ProgressCircle/ProgressCircle.qml index 9e3031a392..77df295395 100644 --- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/ProgressCircle/ProgressCircle.qml +++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/ProgressCircle/ProgressCircle.qml @@ -71,7 +71,9 @@ Item { ctx.beginPath() ctx.fillStyle = root.colorCircle ctx.moveTo(x, y) - ctx.arc(x, y, width / 2, start, end, false) + // Using `width` instead of `width/2` as the argument here ensures + // that the ProgressCircle mask will cover the entirety of non-circular emoji. + ctx.arc(x, y, width, start, end, false) ctx.lineTo(x, y) ctx.fill() } else { @@ -88,6 +90,8 @@ Item { ctx.strokeStyle = root.colorCircle ctx.stroke() } + + ctx.scale(0.1, 0.2); } } } \ No newline at end of file