mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Find taskbar window on the same monitor
This commit is contained in:
parent
a711c89409
commit
a33ca97298
1 changed files with 24 additions and 3 deletions
|
@ -35,8 +35,29 @@ bool IsCompositionEnabled() {
|
||||||
return success && result;
|
return success && result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsTaskbarAutoHidden(PUINT pEdge = nullptr) {
|
HWND FindTaskbarWindow(LPRECT rcMon = nullptr) {
|
||||||
HWND hTaskbar = FindWindowW(L"Shell_TrayWnd", nullptr);
|
HWND hTaskbar = nullptr;
|
||||||
|
RECT rcTaskbar, rcMatch;
|
||||||
|
|
||||||
|
while ((hTaskbar = FindWindowEx(
|
||||||
|
nullptr,
|
||||||
|
hTaskbar,
|
||||||
|
L"Shell_TrayWnd",
|
||||||
|
nullptr)) != nullptr) {
|
||||||
|
if (!rcMon) {
|
||||||
|
break; // OK, return first found
|
||||||
|
}
|
||||||
|
if (GetWindowRect(hTaskbar, &rcTaskbar)
|
||||||
|
&& IntersectRect(&rcMatch, &rcTaskbar, rcMon)) {
|
||||||
|
break; // OK, taskbar match monitor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return hTaskbar;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsTaskbarAutoHidden(LPRECT rcMon = nullptr, PUINT pEdge = nullptr) {
|
||||||
|
HWND hTaskbar = FindTaskbarWindow(rcMon);
|
||||||
if (!hTaskbar) {
|
if (!hTaskbar) {
|
||||||
if (pEdge) {
|
if (pEdge) {
|
||||||
*pEdge = (UINT)-1;
|
*pEdge = (UINT)-1;
|
||||||
|
@ -134,7 +155,7 @@ bool EventFilter::customWindowFrameEvent(
|
||||||
if (GetMonitorInfo(hMonitor, &mi)) {
|
if (GetMonitorInfo(hMonitor, &mi)) {
|
||||||
*r = mi.rcWork;
|
*r = mi.rcWork;
|
||||||
UINT uEdge = (UINT)-1;
|
UINT uEdge = (UINT)-1;
|
||||||
if (IsTaskbarAutoHidden(&uEdge)) {
|
if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
|
||||||
switch (uEdge) {
|
switch (uEdge) {
|
||||||
case ABE_LEFT: r->left += 1; break;
|
case ABE_LEFT: r->left += 1; break;
|
||||||
case ABE_RIGHT: r->right -= 1; break;
|
case ABE_RIGHT: r->right -= 1; break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue