include percentage with progress bar (#492)

RetroAchievements · Dec 1, 2019 · e1c956f · e1c956f
1 parent 8944e86
commit e1c956f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/ui/viewmodels/OverlayListPageViewModel.cpp b/src/ui/viewmodels/OverlayListPageViewModel.cpp
@@ -1,6 +1,7 @@
 #include "OverlayListPageViewModel.hh"
 
 #include "ra_math.h"
+#include "RA_StringUtils.h"
 
 #include "services\IThreadPool.hh"
 
@@ -145,10 +146,16 @@ void OverlayListPageViewModel::RenderList(ra::ui::drawing::ISurface& pSurface, i
         {
             const auto nProgressBarWidth = (nWidth - nTextX - 12) * 2 / 3;
             const auto nValue = pItem->GetProgressValue();
-            const auto nProgressBarFillWidth = (nProgressBarWidth - 2) * nValue / nTarget;
+            const auto nProgressBarFillWidth = gsl::narrow_cast<int>(((static_cast<long>(nProgressBarWidth) - 2) * nValue) / nTarget);
+            const auto nProgressBarPercent = gsl::narrow_cast<int>(static_cast<long>(nValue) * 100 / nTarget);
 
             pSurface.FillRectangle(nTextX + 12, nY + 1 + 26 + 25, nProgressBarWidth, 8, pTheme.ColorOverlayScrollBar());
             pSurface.FillRectangle(nTextX + 12 + 2, nY + 1 + 26 + 25 + 2, nProgressBarFillWidth - 4, 8 - 4, pTheme.ColorOverlayScrollBarGripper());
+
+            const auto nProgressFont = pSurface.LoadFont(pTheme.FontOverlay(), 14, ra::ui::FontStyles::Normal);
+            const std::wstring sProgressPercent = ra::StringPrintf(L"%d%%", nProgressBarPercent);
+            const auto szProgressPercent = pSurface.MeasureText(nProgressFont, sProgressPercent);
+            pSurface.WriteText(nTextX + 12 + nProgressBarWidth + 6, nY + 1 + 26 + 25 + 4 - (szProgressPercent.Height / 2) - 1, nProgressFont, nSubTextColor, sProgressPercent);
         }
 
         nIndex++;