From 552fbd8296edfcb239d076a5b8d7b0b39de2a299 Mon Sep 17 00:00:00 2001 From: ge0rdi Date: Sat, 4 Jan 2025 16:10:52 +0100 Subject: [PATCH] Set position of tray buttons on primary taskbar only It seems that secondary taskbars handle try button positioning correctly. So there is no need for this workaround. Original change was introduced in 674a486 due to #1232 issue. --- Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp index 0cfcdee7b..5022f67f0 100644 --- a/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp +++ b/Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp @@ -3179,11 +3179,14 @@ static void RecreateStartButton( size_t taskbarId ) RECT rcTask; GetWindowRect(taskBar.taskBar,&rcTask); PostMessage(taskBar.taskBar,WM_SIZE,SIZE_RESTORED,MAKELONG(rcTask.right-rcTask.left,rcTask.bottom-rcTask.top)); - for (auto btn : taskBar.trayButtons) + if (taskBar.taskBar==g_TaskBar) { - RECT rc; - GetWindowRect(btn,&rc); - SetWindowPos(btn,HWND_TOP,rc.left,rc.top,0,0,SWP_NOSIZE|SWP_NOACTIVATE|SWP_NOZORDER); + for (auto btn : taskBar.trayButtons) + { + RECT rc; + GetWindowRect(btn,&rc); + SetWindowPos(btn,HWND_TOP,rc.left,rc.top,0,0,SWP_NOSIZE|SWP_NOACTIVATE|SWP_NOZORDER); + } } } }