timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-13 20:28:31 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix custom button position on auto-hiding taskbar

Browse Source 
Fixes #2067.
This commit is contained in:
ge0rdi
2025-01-04 16:10:52 +01:00
parent 552fbd8296
commit faf79de4d5
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
View File

@@ -1216,6 +1216,19 @@ 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) static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPOS* pPos)
{ {
if (IsStartButtonSmallIcons(taskBar->taskbarId) != IsTaskbarSmallIcons()) if (IsStartButtonSmallIcons(taskBar->taskbarId) != IsTaskbarSmallIcons())
@@ -1223,10 +1236,13 @@ static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPO
RECT rcTask; RECT rcTask;
GetWindowRect(taskBar->taskBar, &rcTask); GetWindowRect(taskBar->taskBar, &rcTask);
if (RECT rc; GetWindowRgnBox(taskBar->taskBar, &rc) != ERROR) if (IsTouchTaskbar())
{ {
MapWindowPoints(taskBar->taskBar, NULL, (POINT*)&rc, 2); if (RECT rc; GetWindowRgnBox(taskBar->taskBar, &rc) != ERROR)
rcTask = rc; {
MapWindowPoints(taskBar->taskBar, NULL, (POINT*)&rc, 2);
rcTask = rc;
}
} }
MONITORINFO info; MONITORINFO info;
UINT uEdge = GetTaskbarPosition(taskBar->taskBar, &info, NULL, NULL); UINT uEdge = GetTaskbarPosition(taskBar->taskBar, &info, NULL, NULL);