From 30cd5d6c4d811e239cc58bc7cdba54353fac157d Mon Sep 17 00:00:00 2001 From: Mathias Boulay Date: Mon, 14 Aug 2023 13:13:07 +0200 Subject: [PATCH] Fix[UI]: progressbar text is properly padded --- .../src/main/java/com/kdt/mcgui/TextProgressBar.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app_pojavlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java b/app_pojavlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java index 5273c6c3b..db1862ebc 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java +++ b/app_pojavlauncher/src/main/java/com/kdt/mcgui/TextProgressBar.java @@ -46,7 +46,7 @@ public class TextProgressBar extends ProgressBar { protected synchronized void onDraw(Canvas canvas) { super.onDraw(canvas); mTextPaint.setTextSize((float) ((getHeight()- getPaddingBottom() - getPaddingTop()) * 0.55)); - int xPos = (int) Math.max(Math.min(getProgress() * getWidth() / getMax(), getWidth() - mTextPaint.measureText(mText)) - mTextPadding, mTextPadding); + int xPos = (int) Math.max(Math.min((getProgress() * getWidth() / getMax()) + mTextPadding, getWidth() - mTextPaint.measureText(mText) - mTextPadding) , mTextPadding); int yPos = (int) ((getHeight() / 2) - ((mTextPaint.descent() + mTextPaint.ascent()) / 2)) ; canvas.drawText(mText, xPos, yPos, mTextPaint);