From a00ca05136f4e339152ca4bb6df1d097441bc588 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 16 Jun 2018 20:10:39 -0400
Subject: [PATCH] Added themed progressbars.

---
 windows/tabledraw.cpp | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/windows/tabledraw.cpp b/windows/tabledraw.cpp
index bc2e76d9..8e6cb940 100644
--- a/windows/tabledraw.cpp
+++ b/windows/tabledraw.cpp
@@ -329,7 +329,7 @@ static HRESULT drawProgressBarPart(struct drawState *s)
 		return S_OK;
 	progress = uiprivTableProgress(s->t, s->iItem, s->iSubItem, s->p->progressBarModelColumn, &indeterminatePos);
 
-	theme = OpenThemeData(s->t->hwnd, L"TODO");
+	theme = OpenThemeData(s->t->hwnd, L"PROGRESS");
 
 	if (GetTextMetricsW(s->dc, &tm) == 0) {
 		logLastError(L"GetTextMetricsW()");
@@ -345,8 +345,23 @@ static HRESULT drawProgressBarPart(struct drawState *s)
 	rBorder = r;
 	InflateRect(&rBorder, -1, -1);
 	if (theme != NULL) {
-		// TODO
-	}/* else */{
+		RECT crect;
+
+		hr = GetThemeBackgroundContentRect(theme, s->dc,
+			PP_TRANSPARENTBAR, PBBS_NORMAL,
+			&rBorder, &crect);
+		if (hr != S_OK) {
+			logHRESULT(L"GetThemeBackgroundContentRect()", hr);
+			goto fail;
+		}
+		hr = DrawThemeBackground(theme, s->dc,
+			PP_TRANSPARENTBAR, PBBS_NORMAL,
+			&crect, NULL);
+		if (hr != S_OK) {
+			logHRESULT(L"DrawThemeBackground() border", hr);
+			goto fail;
+		}
+	} else {
 		HPEN pen, prevPen;
 		HBRUSH brush, prevBrush;
 
@@ -389,12 +404,18 @@ static HRESULT drawProgressBarPart(struct drawState *s)
 			rFill[0].right = rFill[0].left + pieceWidth;
 	}
 	for (i = 0; i < nFill; i++)
-{		if (theme != NULL) {
-			// TODO
-		}/* else*/
+		if (theme != NULL) {
+			hr = DrawThemeBackground(theme, s->dc,
+				PP_FILL, PBFS_NORMAL,
+				&rFill[i], NULL);
+			if (hr != S_OK) {
+				logHRESULT(L"DrawThemeBackground() fill", hr);
+				goto fail;
+			}
+		} else
 			// TODO check errors
 			FillRect(s->dc, &rFill[i], GetSysColorBrush(sysColor));
-}
+
 	hr = S_OK;
 fail:
 	// TODO check errors