From c25831ec666fd3f9a3e883915825f46eae8b0749 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Mon, 5 Nov 2018 21:09:50 -0500
Subject: [PATCH] Properly sized the explorer bar now.

---
 doc/misctests/winbuttonexplorertheme.cpp | 49 +++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/doc/misctests/winbuttonexplorertheme.cpp b/doc/misctests/winbuttonexplorertheme.cpp
index 400bcb84..de70db66 100644
--- a/doc/misctests/winbuttonexplorertheme.cpp
+++ b/doc/misctests/winbuttonexplorertheme.cpp
@@ -610,14 +610,25 @@ void repositionButtons(HWND hwnd)
 {
 	HDWP dwp;
 	int buttonx, buttony;
+	HDC dc;
+	int dpiX;
+	int dpiY;
 	struct buttonMetrics m;
 	int i;
 
+	dc = GetDC(hwnd);
+	if (dc == NULL)
+		diele("GetDC()");
+	dpiX = GetDeviceCaps(dc, LOGPIXELSX);
+	dpiY = GetDeviceCaps(dc, LOGPIXELSY);
+	// TODO check error
+	ReleaseDC(hwnd, dc);
+
 	dwp = BeginDeferWindowPos(5);
 	if (dwp == NULL)
 		diele("BeginDeferWindowPos()");
-	buttonx = 5;
-	buttony = 5;
+	buttonx = dipsToX(cmsp->folderBarMarginsLeftDIP(), dpiX);
+	buttony = dipsToY(cmsp->folderBarMarginsTopDIP(), dpiY);
 	for (i = 0; i < 5; i++) {
 		cms->buttonMetrics(cmsp, leftButtons[i], NULL, &m);
 		dwp = DeferWindowPos(dwp, leftButtons[i], NULL,
@@ -631,6 +642,33 @@ void repositionButtons(HWND hwnd)
 		diele("EndDeferWindowPos()");
 }
 
+// TODO check errors
+void folderBarRect(HWND hwnd, HDC dc, RECT *r)
+{
+	int dpiX;
+	int dpiY;
+	RECT child;
+	int i;
+
+	dpiX = GetDeviceCaps(dc, LOGPIXELSX);
+	dpiY = GetDeviceCaps(dc, LOGPIXELSY);
+
+	GetClientRect(hwnd, r);
+	r->right -= r->left;
+	r->left = 0;
+	r->top = 0;
+	r->bottom = 0;
+
+	for (i = 0; i < 5; i++) {
+		GetWindowRect(leftButtons[i], &child);
+		if (r->bottom < (child.bottom - child.top))
+			r->bottom = (child.bottom - child.top);
+	}
+
+	r->bottom += dipsToY(cmsp->folderBarMarginsTopDIP(), dpiY);
+	r->bottom += dipsToY(cmsp->folderBarMarginsBottomDIP(), dpiY);
+}
+
 #if 0
 // TODO check errors
 void handleEvents(HWND hwnd, WPARAM wParam)
@@ -745,13 +783,14 @@ LRESULT CALLBACK wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		// TODO check errors
 		dc = BeginPaint(hwnd, &ps);
 		{RECT w;
-		GetClientRect(hwnd,&w);
+		folderBarRect(hwnd, dc, &w);
 		cms->drawFolderBar(cmsp, dc, &w, &(ps.rcPaint));}
 		EndPaint(hwnd, &ps);
 		return 0;
 	case WM_PRINTCLIENT:
-		{RECT w;
-		GetClientRect(hwnd,&w);
+		{RECT w, paint;
+		folderBarRect(hwnd, (HDC) wParam, &w);
+		GetClientRect(hwnd,&paint);
 		cms->drawFolderBar(cmsp, (HDC) wParam, &w, &w);}
 		return 0;
 #if 0