dll: Fix resizing problem on Win10TH2 or earlier

Use the old method for earlier Windows.
k-takata · Sep 3, 2016 · 0cdf856 · 0cdf856
1 parent 9c8c6ca
commit 0cdf856
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/source/dll/draw.c b/source/dll/draw.c
@@ -255,24 +255,25 @@ LRESULT CalcRect(HWND hwnd, int *textwidth, int *textheight)
 
 	if(g_bFitClock)
 	{
-		//RECT rcTray;
-		RECT rcTaskbar;
+		RECT rcTray;
+		int h = g_OrigClockHeight, w = g_OrigClockWidth;
 
-		//GetWindowRect(GetParent(hwnd), &rcTray);
-		GetClientRect(GetParent(GetParent(hwnd)), &rcTaskbar);
+		if(!(g_winver&WIN10RS1))
+		{
+			GetWindowRect(GetParent(hwnd), &rcTray);
+			h = rcTray.bottom - rcTray.top;
+			w = rcTray.right - rcTray.left;
+		}
 
 		// horizontal task bar
-		if(rcTaskbar.right - rcTaskbar.left >
-			rcTaskbar.bottom - rcTaskbar.top)
+		if(!IsVertTaskbar(GetParent(GetParent(hwnd))))
 		{
-			//hclock = rcTray.bottom - rcTray.top;
-			hclock = g_OrigClockHeight;
+			hclock = h;
 		}
 		// vertical task bar
 		else
 		{
-			//wclock = rcTray.right - rcTray.left;
-			wclock = g_OrigClockWidth;
+			wclock = w;
 		}
 	}