if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-11-22 08:57:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDA-3707 - Fix getting window handle for maximized windows (#1420) (#1427)

Browse Source
This commit is contained in:
Robin Westberg 2022-07-28 11:37:00 +02:00 committed by GitHub
parent 7d4ac3be51
commit 44f6bb5461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
spec/hwndHandler.spec.ts
View File

@ -67,35 +67,16 @@ describe('hwnd handler', () => {
expect(hwnd).toBe(parent);
});
it('no rect found for parent window', () => {
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(hwnd).toBe(parent);
});
it('no child window found', () => {
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 100);
return 1;
});
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(mockGetWindowRect).toBeCalledTimes(1);
expect(mockGetWindowRect).toBeCalledTimes(0);
expect(mockFindWindowExA).toBeCalledTimes(1);
expect(hwnd).toBe(parent);
});
it('matching child window found', () => {
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 100);
return 1;
});
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 20, 100, 100);
return 1;
});
it('no rect found for child window', () => {
mockFindWindowExA.mockImplementationOnce(() => {
return 4711;
});
@ -103,18 +84,58 @@ describe('hwnd handler', () => {
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(mockGetWindowRect).toBeCalledTimes(1);
expect(mockFindWindowExA).toBeCalledTimes(2);
expect(hwnd).toBe(parent);
});
it('no rect found for second child window', () => {
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 10);
return 1;
});
mockFindWindowExA.mockImplementationOnce(() => {
return 4711;
});
mockFindWindowExA.mockImplementationOnce(() => {
return 42;
});
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(mockGetWindowRect).toBeCalledTimes(2);
expect(mockFindWindowExA).toBeCalledTimes(1);
expect(mockFindWindowExA).toBeCalledTimes(3);
expect(hwnd).toBe(parent);
});
it('matching child window found', () => {
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 20, 100, 100);
return 1;
});
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 10);
return 1;
});
mockFindWindowExA.mockImplementationOnce(() => {
return 4711;
});
mockFindWindowExA.mockImplementationOnce(() => {
return 42;
});
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(mockGetWindowRect).toBeCalledTimes(2);
expect(mockFindWindowExA).toBeCalledTimes(3);
expect(hwnd.readInt32LE(0)).toBe(4711);
});
it('matching child window found second', () => {
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 100);
return 1;
});
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 100, 10, 100, 100);
writeRect(rect, 10, 10, 100, 10);
return 1;
});
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
@ -131,16 +152,12 @@ describe('hwnd handler', () => {
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(mockGetWindowRect).toBeCalledTimes(3);
expect(mockFindWindowExA).toBeCalledTimes(2);
expect(mockGetWindowRect).toBeCalledTimes(2);
expect(mockFindWindowExA).toBeCalledTimes(3);
expect(hwnd.readInt32LE(0)).toBe(42);
});
it('no matching child window found', () => {
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 100);
return 1;
});
mockGetWindowRect.mockImplementationOnce((_hwnd, rect) => {
writeRect(rect, 10, 10, 100, 100);
return 1;
@ -152,7 +169,7 @@ describe('hwnd handler', () => {
const parent = Buffer.from('validhwnd', 'utf8');
const hwnd = getContentWindowHandle(parent);
expect(mockGetWindowRect).toBeCalledTimes(2);
expect(mockGetWindowRect).toBeCalledTimes(1);
expect(mockFindWindowExA).toBeCalledTimes(2);
expect(hwnd).toBe(parent);
});

33
src/app/hwnd-handler.ts
View File

@ -38,10 +38,8 @@ export const getContentWindowHandle = (nativeWindowHandle: Buffer): Buffer => {
};
const parentHwnd = nativeWindowHandle.readBigUInt64LE();
const parentRect = getWindowRect(parentHwnd);
if (!parentRect) {
return nativeWindowHandle;
}
const children = new Map();
let titleChild;
let child = user32.FindWindowExA(
parentHwnd.toString(),
@ -51,13 +49,18 @@ export const getContentWindowHandle = (nativeWindowHandle: Buffer): Buffer => {
);
while (child !== 0) {
const rect = getWindowRect(child);
if (rect) {
children.set(child, rect);
// The candidate child window is located at the same x position as the parent window, but
// has a higher y position (due to the window title frame at the top).
if (rect && parentRect.left === rect.left && parentRect.top < rect.top) {
const ret = Buffer.alloc(8);
ret.writeBigUInt64LE(BigInt(child));
return ret;
// The titlebar child is the one that is the least tall
if (!titleChild) {
titleChild = child;
} else {
const curTitleRect = children.get(titleChild)!;
if (rect.bottom - rect.top < curTitleRect.bottom - curTitleRect.top) {
titleChild = child;
}
}
}
child = user32.FindWindowExA(
parentHwnd.toString(),
@ -66,5 +69,15 @@ export const getContentWindowHandle = (nativeWindowHandle: Buffer): Buffer => {
null,
);
}
// Return the first child window that isn't the title bar
for (const hwnd of children.keys()) {
if (hwnd !== titleChild) {
const ret = Buffer.alloc(8);
ret.writeBigUInt64LE(BigInt(hwnd));
return ret;
}
}
return nativeWindowHandle;
};