Froz
/
ExplorerPatcher
mirror of https://github.com/valinet/ExplorerPatcher.git
1
0
Fork 0
Code Issues Projects Releases 1 Wiki Activity
Browse Source

Taskbar10: Implemented centered taskbar

pull/996/head
Valentin Radu 4 years ago
parent
84f46606e1
commit
eb1d960bcc
4 changed files with 323 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 251
      ExplorerPatcher/TaskbarCenter.c
  2. 5
      ExplorerPatcher/TaskbarCenter.h
  3. 88
      ExplorerPatcher/dllmain.c
  4. 16
      ExplorerPatcher/settings.reg

251
ExplorerPatcher/TaskbarCenter.c
Unescape View File

@ -1,62 +1,247 @@
#include "TaskbarCenter.h" #include "TaskbarCenter.h"
HANDLE hEvent; extern DWORD dwOldTaskbarAl;
extern DWORD dwMMOldTaskbarAl;
extern wchar_t* EP_TASKBAR_LENGTH_PROP_NAME;
#define EP_TASKBAR_LENGTH_TOO_SMALL 20
HRESULT TaskbarCenter_Center() inline BOOL TaskbarCenter_IsTaskbarHorizontal(HWND hWnd)
{ {
HRESULT hr = S_OK; __int64 v1;
HWND hWnd = FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL); __int64 result;
v1 = *((__int64*)GetWindowLongPtrW(hWnd, 0) + 13);
result = 1i64;
if (v1)
return (*(__int64(__fastcall**)(__int64))(*(__int64*)v1 + 96))(v1);
return result;
}
while (hWnd) inline BOOL TaskbarCenter_ShouldCenter(DWORD dwSetting)
{
if (SUCCEEDED(hr))
{ {
/*hr = AccessibleObjectFromWindow( return (dwSetting & 0b001);
);*/
} }
hWnd = NULL; inline BOOL TaskbarCenter_ShouldStartBeCentered(DWORD dwSetting)
{
return (dwSetting & 0b010);
} }
inline BOOL TaskbarCenter_ShouldLeftAlignWhenSpaceConstrained(DWORD dwSetting)
{
return (dwSetting & 0b100);
} }
BOOL TaskbarCenter_Notify() HRESULT TaskbarCenter_Center(HWND hWnd, RECT rc, BOOL bIsTaskbarHorizontal)
{
HRESULT hr = S_OK;
VARIANT vtChild[10];
VARIANT vt;
long k = 0, kk = 0;
IAccessible* pAccessible = NULL;
AccessibleObjectFromWindow(hWnd, 0, &IID_IAccessible, &pAccessible);
if (pAccessible)
{
pAccessible->lpVtbl->get_accChildCount(pAccessible, &kk);
if (kk <= 10)
{
AccessibleChildren(pAccessible, 0, kk, vtChild, &k);
for (int i = 0; i < k; ++i)
{ {
if (hEvent) if (vtChild[i].vt == VT_DISPATCH)
{ {
SetEvent(hEvent); IDispatch* pDisp = vtChild[i].ppdispVal;
return TRUE; IAccessible* pChild = NULL;
pDisp->lpVtbl->QueryInterface(pDisp, &IID_IAccessible, &pChild);
if (pChild)
{
vt.vt = VT_I4;
vt.lVal = CHILDID_SELF;
pChild->lpVtbl->get_accRole(pChild, vt, &vt);
if (vt.lVal == ROLE_SYSTEM_TOOLBAR)
{
IAccessible* pLast = NULL;
kk = 0;
pChild->lpVtbl->get_accChildCount(pChild, &kk);
if (kk <= 1)
{
SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, -1);
} }
return FALSE; else if (kk >= 2)
{
vt.vt = VT_I4;
vt.lVal = kk - 1;
long x = 0, y = 0, w = 0, h = 0, d = 0;
pChild->lpVtbl->accLocation(pChild, &x, &y, &w, &h, vt);
if (bIsTaskbarHorizontal ? (x == -1 || w < EP_TASKBAR_LENGTH_TOO_SMALL) : (y == -1 || h < EP_TASKBAR_LENGTH_TOO_SMALL))
{
hr = E_FAIL;
} }
else
BOOL GetClientRectHook(HWND hWnd, LPRECT lpRect) {
if (kk >= 3)
{ {
wchar_t wszClassName[100]; d = (bIsTaskbarHorizontal ? ((x - rc.left) + w) : ((y - rc.top) + h));
ZeroMemory(wszClassName, 100); vt.vt = VT_I4;
GetClassNameW(hWnd, wszClassName, 100); vt.lVal = 1;
if (!wcscmp(wszClassName, L"MSTaskListWClass")) x = 0, y = 0, w = 0, h = 0;
pChild->lpVtbl->accLocation(pChild, &x, &y, &w, &h, vt);
if (bIsTaskbarHorizontal ? w == 0 : h == 0)
{ {
TaskbarCenter_Center(); vt.vt = VT_I4;
vt.lVal = 2;
x = 0, y = 0, w = 0, h = 0;
pChild->lpVtbl->accLocation(pChild, &x, &y, &w, &h, vt);
}
if (bIsTaskbarHorizontal ? (x == -1 || w < EP_TASKBAR_LENGTH_TOO_SMALL) : (y == -1 || h < EP_TASKBAR_LENGTH_TOO_SMALL))
{
hr == E_FAIL;
}
else
{
SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, (bIsTaskbarHorizontal ? (d - (x - rc.left)) : (d - (y - rc.top))));
}
}
else
{
SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, bIsTaskbarHorizontal ? w : h);
}
}
}
}
pChild->lpVtbl->Release(pChild);
}
pDisp->lpVtbl->Release(pDisp);
}
} }
return GetClientRect(hWnd, lpRect); }
pAccessible->lpVtbl->Release(pAccessible);
}
return hr;
} }
HRESULT TaskbarCenter_Initialize(HMODULE hExplorer) BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
{
BOOL bWasCalled = FALSE;
HWND hWndStart = NULL;
RECT rcStart;
SetRect(&rcStart, 0, 0, 0, 0);
if (GetClassWord(hWnd, GCW_ATOM) == RegisterWindowMessageW(L"MSTaskListWClass"))
{ {
if (!(hEvent = CreateEventW(NULL, TRUE, FALSE, TASKBAR_CHANGED_NOTIFICATION))) BOOL bIsPrimaryTaskbar = GetClassWord(GetParent(hWnd), GCW_ATOM) == RegisterWindowMessageW(L"MSTaskSwWClass");
DWORD dwSetting = (bIsPrimaryTaskbar ? dwOldTaskbarAl : dwMMOldTaskbarAl);
HWND hWndTaskbar = NULL;
if (bIsPrimaryTaskbar)
{
hWndTaskbar = GetParent(GetParent(GetParent(hWnd)));
}
else
{ {
return E_NOTIMPL; hWndTaskbar = GetParent(GetParent(hWnd));
} }
if (FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL)) hWndStart = FindWindowExW(hWndTaskbar, NULL, L"Start", NULL);
BOOL bIsTaskbarHorizontal = TaskbarCenter_IsTaskbarHorizontal(hWnd);
if (TaskbarCenter_ShouldCenter(dwSetting))
{ {
return E_NOTIMPL; if (TaskbarCenter_ShouldStartBeCentered(dwSetting) && hWndStart)
{
GetClientRect(hWndStart, &rcStart);
} }
// This is one of the methods called by explorer!CTaskListWnd::_RecomputeLayout RECT rc;
if (!VnPatchDelayIAT(hExplorer, "ext-ms-win-rtcore-ntuser-window-ext-l1-1-0.dll", "GetClientRect", GetClientRectHook)) GetWindowRect(hWnd, &rc);
MONITORINFO mi;
ZeroMemory(&mi, sizeof(MONITORINFO));
mi.cbSize = sizeof(MONITORINFO);
GetMonitorInfoW(MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY), &mi);
DWORD dwLength = 0;
TaskbarCenter_Center(hWnd, mi.rcMonitor, bIsTaskbarHorizontal);
if (dwLength = GetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME))
{
if (dwLength == -1)
{
if (TaskbarCenter_ShouldStartBeCentered(dwSetting) && hWndStart)
{ {
return E_NOTIMPL; if (bIsTaskbarHorizontal)
{
SetWindowPos(hWndStart, NULL, ((mi.rcMonitor.right - mi.rcMonitor.left) - (rcStart.right - rcStart.left)) / 2, rcStart.top, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
} }
return S_OK; else
{
SetWindowPos(hWndStart, NULL, rcStart.left, ((mi.rcMonitor.bottom - mi.rcMonitor.top) - (rcStart.bottom - rcStart.top)) / 2, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
}
if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, NULL, TRUE);
}
}
else
{
if (TaskbarCenter_ShouldStartBeCentered(dwSetting) && hWndStart)
{
dwLength += (bIsTaskbarHorizontal ? (rcStart.right - rcStart.left) : (rcStart.bottom - rcStart.top));
}
bWasCalled = GetClientRect(hWnd, lpRect);
long res = 0;
if (bIsTaskbarHorizontal)
{
res = ((mi.rcMonitor.right - mi.rcMonitor.left) - dwLength) / 2 - (!TaskbarCenter_ShouldStartBeCentered(dwSetting) ? (rc.left - mi.rcMonitor.left) : 0);
}
else
{
res = ((mi.rcMonitor.bottom - mi.rcMonitor.top) - dwLength) / 2 - (!TaskbarCenter_ShouldStartBeCentered(dwSetting) ? (rc.top - mi.rcMonitor.top) : 0);
}
if (res + dwLength + 5 - (TaskbarCenter_ShouldStartBeCentered(dwSetting) ? (bIsTaskbarHorizontal ? (rc.left - mi.rcMonitor.left) : (rc.top - mi.rcMonitor.top)) : 0) < (bIsTaskbarHorizontal ? lpRect->right : lpRect->bottom))
{
if (bIsTaskbarHorizontal)
{
lpRect->left = res;
}
else
{
lpRect->top = res;
}
if (TaskbarCenter_ShouldLeftAlignWhenSpaceConstrained(dwSetting) || !bIsTaskbarHorizontal)
{
if (bIsTaskbarHorizontal)
{
lpRect->right = (TaskbarCenter_ShouldStartBeCentered(dwSetting) ? (rc.left - mi.rcMonitor.left) : 0) + 10 + lpRect->right;
}
else
{
lpRect->bottom = (TaskbarCenter_ShouldStartBeCentered(dwSetting) ? (rc.top - mi.rcMonitor.top) : 0) + 10 + lpRect->bottom;
}
}
}
if (TaskbarCenter_ShouldStartBeCentered(dwSetting) && hWndStart)
{
if (bIsTaskbarHorizontal)
{
SetWindowPos(hWndStart, NULL, (rc.left - mi.rcMonitor.left) + lpRect->left - (rcStart.right - rcStart.left), rcStart.top, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
}
else
{
SetWindowPos(hWndStart, NULL, rcStart.left, (rc.top - mi.rcMonitor.top) + lpRect->top - (rcStart.bottom - rcStart.top), 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
}
if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, NULL, TRUE);
}
}
}
}
else
{
if (GetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME))
{
RemovePropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME);
}
}
if ((!TaskbarCenter_ShouldCenter(dwSetting) || !TaskbarCenter_ShouldStartBeCentered(dwSetting)) && hWndStart)
{
GetWindowRect(hWndStart, &rcStart);
if (rcStart.left != 0 || rcStart.top != 0)
{
SetWindowPos(hWndStart, NULL, 0, 0, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, NULL, TRUE);
}
}
}
if (bWasCalled) return bWasCalled;
return GetClientRect(hWnd, lpRect);
} }

5
ExplorerPatcher/TaskbarCenter.h
Unescape View File

@ -3,10 +3,9 @@
#include <initguid.h> #include <initguid.h>
#include <Windows.h> #include <Windows.h>
#include <oleacc.h> #include <oleacc.h>
#include <tchar.h>
#pragma comment(lib, "Oleacc.lib") #pragma comment(lib, "Oleacc.lib")
#include <valinet/hooking/iatpatch.h> #include <valinet/hooking/iatpatch.h>
#define TASKBAR_CHANGED_NOTIFICATION L"Global\\ExplorerPatcher_TaskbarChangedNotification_{B37553B7-425C-44F6-A04A-126849EE59CB}" BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect);
HRESULT TaskbarCenter_Initialize(HMODULE);
#endif #endif

88
ExplorerPatcher/dllmain.c
Unescape View File

@ -125,6 +125,8 @@ DWORD bWasPinnedItemsActAsQuickLaunch = FALSE;
DWORD bPinnedItemsActAsQuickLaunch = FALSE; DWORD bPinnedItemsActAsQuickLaunch = FALSE;
DWORD bWasRemoveExtraGapAroundPinnedItems = FALSE; DWORD bWasRemoveExtraGapAroundPinnedItems = FALSE;
DWORD bRemoveExtraGapAroundPinnedItems = FALSE; DWORD bRemoveExtraGapAroundPinnedItems = FALSE;
DWORD dwOldTaskbarAl = 0b110;
DWORD dwMMOldTaskbarAl = 0b110;
int Code = 0; int Code = 0;
HRESULT InjectStartFromExplorer(); HRESULT InjectStartFromExplorer();
void InvokeClockFlyout(); void InvokeClockFlyout();
@ -179,6 +181,7 @@ DWORD S_Icon_Dark_Widgets = 0;
#include "ImmersiveFlyouts.h" #include "ImmersiveFlyouts.h"
#include "updates.h" #include "updates.h"
DWORD dwUpdatePolicy = UPDATE_POLICY_DEFAULT; DWORD dwUpdatePolicy = UPDATE_POLICY_DEFAULT;
wchar_t* EP_TASKBAR_LENGTH_PROP_NAME = _T("ExplorerPatcher_") _T(EP_CLSID) _T("_Length");
HRESULT WINAPI _DllRegisterServer(); HRESULT WINAPI _DllRegisterServer();
HRESULT WINAPI _DllUnregisterServer(); HRESULT WINAPI _DllUnregisterServer();
@ -744,6 +747,19 @@ LRESULT CALLBACK EP_Service_Window_WndProc(
InvokeClockFlyout(); InvokeClockFlyout();
return 0; return 0;
} }
else if (uMsg == WM_TIMER && wParam == 1)
{
SendNotifyMessageW(HWND_BROADCAST, WM_WININICHANGE, 0, (LPARAM)L"ConvertibleSlateMode");
SetTimer(hWnd, 2, 1000, NULL);
KillTimer(hWnd, 1);
return 0;
}
else if (uMsg == WM_TIMER && wParam == 2)
{
SendNotifyMessageW(HWND_BROADCAST, WM_WININICHANGE, 0, (LPARAM)L"ConvertibleSlateMode");
KillTimer(hWnd, 2);
return 0;
}
return DefWindowProcW(hWnd, uMsg, wParam, lParam); return DefWindowProcW(hWnd, uMsg, wParam, lParam);
} }
@ -779,6 +795,10 @@ DWORD EP_ServiceWindowThread(DWORD unused)
RegisterHotKey(hWnd, 1, MOD_WIN | MOD_NOREPEAT, 'C'); RegisterHotKey(hWnd, 1, MOD_WIN | MOD_NOREPEAT, 'C');
} }
RegisterHotKey(hWnd, 2, MOD_WIN | MOD_ALT, 'D'); RegisterHotKey(hWnd, 2, MOD_WIN | MOD_ALT, 'D');
if (bOldTaskbar && (dwOldTaskbarAl || dwMMOldTaskbarAl))
{
SetTimer(hWnd, 1, 5000, NULL);
}
MSG msg; MSG msg;
BOOL bRet; BOOL bRet;
while ((bRet = GetMessageW(&msg, NULL, 0, 0)) != 0) while ((bRet = GetMessageW(&msg, NULL, 0, 0)) != 0)
@ -5274,11 +5294,12 @@ DWORD WindowSwitcher(DWORD unused)
#pragma region "Load Settings from registry" #pragma region "Load Settings from registry"
#define REFRESHUI_NONE 0b0000 #define REFRESHUI_NONE 0b00000
#define REFRESHUI_GLOM 0b0001 #define REFRESHUI_GLOM 0b00001
#define REFRESHUI_ORB 0b0010 #define REFRESHUI_ORB 0b00010
#define REFRESHUI_PEOPLE 0b0100 #define REFRESHUI_PEOPLE 0b00100
#define REFRESHUI_TASKBAR 0b1000 #define REFRESHUI_TASKBAR 0b01000
#define REFRESHUI_CENTER 0b10000
void WINAPI LoadSettings(LPARAM lParam) void WINAPI LoadSettings(LPARAM lParam)
{ {
BOOL bIsExplorer = LOWORD(lParam); BOOL bIsExplorer = LOWORD(lParam);
@ -5471,6 +5492,36 @@ void WINAPI LoadSettings(LPARAM lParam)
); );
} }
dwSize = sizeof(DWORD); dwSize = sizeof(DWORD);
dwTemp = 0;
RegQueryValueExW(
hKey,
TEXT("OldTaskbarAl"),
0,
NULL,
&dwTemp,
&dwSize
);
if (dwTemp != dwOldTaskbarAl)
{
dwOldTaskbarAl = dwTemp;
dwRefreshUIMask |= REFRESHUI_CENTER;
}
dwSize = sizeof(DWORD);
dwTemp = 0;
RegQueryValueExW(
hKey,
TEXT("MMOldTaskbarAl"),
0,
NULL,
&dwTemp,
&dwSize
);
if (dwTemp != dwMMOldTaskbarAl)
{
dwMMOldTaskbarAl = dwTemp;
dwRefreshUIMask |= REFRESHUI_CENTER;
}
dwSize = sizeof(DWORD);
RegQueryValueExW( RegQueryValueExW(
hKey, hKey,
TEXT("HideExplorerSearchBar"), TEXT("HideExplorerSearchBar"),
@ -6096,6 +6147,10 @@ void WINAPI LoadSettings(LPARAM lParam)
if (bOldTaskbar && (dwTemp != dwTaskbarGlomLevel)) if (bOldTaskbar && (dwTemp != dwTaskbarGlomLevel))
{ {
dwRefreshUIMask = REFRESHUI_GLOM; dwRefreshUIMask = REFRESHUI_GLOM;
if (dwOldTaskbarAl)
{
dwRefreshUIMask = REFRESHUI_CENTER;
}
} }
dwTaskbarGlomLevel = dwTemp; dwTaskbarGlomLevel = dwTemp;
dwTemp = MMTASKBARGLOMLEVEL_DEFAULT; dwTemp = MMTASKBARGLOMLEVEL_DEFAULT;
@ -6111,6 +6166,10 @@ void WINAPI LoadSettings(LPARAM lParam)
if (bOldTaskbar && (dwTemp != dwMMTaskbarGlomLevel)) if (bOldTaskbar && (dwTemp != dwMMTaskbarGlomLevel))
{ {
dwRefreshUIMask = REFRESHUI_GLOM; dwRefreshUIMask = REFRESHUI_GLOM;
if (dwMMOldTaskbarAl)
{
dwRefreshUIMask = REFRESHUI_CENTER;
}
} }
dwMMTaskbarGlomLevel = dwTemp; dwMMTaskbarGlomLevel = dwTemp;
RegCloseKey(hKey); RegCloseKey(hKey);
@ -6341,6 +6400,15 @@ void WINAPI LoadSettings(LPARAM lParam)
RegSetKeyValueW(HKEY_CURRENT_USER, IsWindows11() ? TEXT(REGPATH) : L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel", REG_DWORD, &dwGlomLevel, sizeof(DWORD)); RegSetKeyValueW(HKEY_CURRENT_USER, IsWindows11() ? TEXT(REGPATH) : L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel", REG_DWORD, &dwGlomLevel, sizeof(DWORD));
Explorer_RefreshUI(0);*/ Explorer_RefreshUI(0);*/
} }
if (dwRefreshUIMask & REFRESHUI_CENTER)
{
#ifdef _WIN64
//SendNotifyMessageW(HWND_BROADCAST, WM_WININICHANGE, 0, (LPARAM)L"ConvertibleSlateMode");
ToggleTaskbarAutohide();
Sleep(1000);
ToggleTaskbarAutohide();
#endif
}
} }
} }
@ -8938,15 +9006,15 @@ DWORD Inject(BOOL bIsExplorer)
// This notifies applications when the taskbar has recomputed its layout
/*if (SUCCEEDED(TaskbarCenter_Initialize(hExplorer))) if (VnPatchDelayIAT(hExplorer, "ext-ms-win-rtcore-ntuser-window-ext-l1-1-0.dll", "GetClientRect", TaskbarCenter_GetClientRectHook))
{ {
printf("Initialized taskbar update notification.\n"); printf("Initialized taskbar centering module.\n");
} }
else else
{ {
printf("Failed to register taskbar update notification.\n"); printf("Failed to initialize taskbar centering module.\n");
}*/ }

16
ExplorerPatcher/settings.reg
Unescape View File

@ -53,6 +53,20 @@
;x 0 Windows 10 (default) ;x 0 Windows 10 (default)
;x 1 Windows 11 ;x 1 Windows 11
"OrbStyle"=dword:00000000 "OrbStyle"=dword:00000000
;c 5 Primary taskbar alignment
;x 0 At screen edge (default)
;x 1 Centered
;x 5 Centered, at screen edge when full
;x 3 Centered with Start button
;x 7 Centered with Start button, at screen edge when full
"OldTaskbarAl"=dword:00000000
;c 5 Secondary taskbar(s) alignment
;x 0 At screen edge (default)
;x 1 Centered
;x 5 Centered, at screen edge when full
;x 3 Centered with Start button
;x 7 Centered with Start button, at screen edge when full
"MMOldTaskbarAl"=dword:00000000
;c 3 Combine taskbar icons on primary taskbar ;c 3 Combine taskbar icons on primary taskbar
;x 0 Always combine ;x 0 Always combine
;x 1 Combine when taskbar is full ;x 1 Combine when taskbar is full
@ -223,7 +237,7 @@
"MakeAllAppsDefault"=dword:00000000 "MakeAllAppsDefault"=dword:00000000
[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced] [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
;c 2 Position on screen ;c 2 Position on screen
;x 0 Left ;x 0 At screen edge
;x 1 Center (default) ;x 1 Center (default)
"TaskbarAl"=dword:00000001 "TaskbarAl"=dword:00000001
;t The following settings only apply to the Windows 10 Start menu: ;t The following settings only apply to the Windows 10 Start menu:

Write Preview
Loading…
Cancel
Save