Fix custom button position on auto-hiding taskbar

Fixes #2067.
Open-Shell · Jan 4, 2025 · faf79de · faf79de
1 parent 552fbd8
commit faf79de
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
@@ -1216,17 +1216,33 @@ void EnableHotkeys( THotkeys enable )
 	}
 }
 
+bool IsTouchTaskbar(void)
+{
+	if (!IsWin11())
+		return false;
+
+	CRegKey regKey;
+	if (regKey.Open(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer") != ERROR_SUCCESS)
+		return false;
+
+	DWORD val;
+	return regKey.QueryDWORDValue(L"TabletPostureTaskbar", val) == ERROR_SUCCESS && val;
+}
+
 static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPOS* pPos)
 {
 	if (IsStartButtonSmallIcons(taskBar->taskbarId) != IsTaskbarSmallIcons())
 		RecreateStartButton(taskBar->taskbarId);
 
 	RECT rcTask;
 	GetWindowRect(taskBar->taskBar, &rcTask);
-	if (RECT rc; GetWindowRgnBox(taskBar->taskBar, &rc) != ERROR)
+	if (IsTouchTaskbar())
 	{
-		MapWindowPoints(taskBar->taskBar, NULL, (POINT*)&rc, 2);
-		rcTask = rc;
+		if (RECT rc; GetWindowRgnBox(taskBar->taskBar, &rc) != ERROR)
+		{
+			MapWindowPoints(taskBar->taskBar, NULL, (POINT*)&rc, 2);
+			rcTask = rc;
+		}
 	}
 	MONITORINFO info;
 	UINT uEdge = GetTaskbarPosition(taskBar->taskBar, &info, NULL, NULL);