mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: falsy transparent shouldn't affect webContents background (#36914)

Browse source
This commit is contained in:
David Sanders 2023-05-02 14:44:34 -07:00 • committed by GitHub
parent d95f9d2c63
commit a26343f3e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 65 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
spec/guest-window-manager-spec.ts
View file

@ -1,7 +1,10 @@
import { BrowserWindow } from 'electron';
import { BrowserWindow, screen } from 'electron';
import { expect, assert } from 'chai';
import { areColorsSimilar, captureScreen, HexColors, getPixelColor } from './lib/screen-helpers';
import { ifit } from './lib/spec-helpers';
import { closeAllWindows } from './lib/window-helpers';
import { once } from 'events';
import { setTimeout as setTimeoutAsync } from 'timers/promises';
describe('webContents.setWindowOpenHandler', () => {
let browserWindow: BrowserWindow;
@ -193,4 +196,31 @@ describe('webContents.setWindowOpenHandler', () => {
browserWindow.webContents.executeJavaScript("window.open('https://127.0.0.1')");
expect(await browserWindow.webContents.executeJavaScript('42')).to.equal(42);
});
// Linux and arm64 platforms (WOA and macOS) do not return any capture sources
ifit(process.platform === 'darwin' && process.arch === 'x64')('should not make child window background transparent', (done) => {
browserWindow.webContents.setWindowOpenHandler(() => ({ action: 'allow' }));
browserWindow.webContents.once('did-create-window', async (childWindow) => {
const display = screen.getPrimaryDisplay();
childWindow.setBounds(display.bounds);
await childWindow.webContents.executeJavaScript("const meta = document.createElement('meta'); meta.name = 'color-scheme'; meta.content = 'dark'; document.head.appendChild(meta); true;");
await setTimeoutAsync(1000);
const screenCapture = await captureScreen();
const centerColor = getPixelColor(screenCapture, {
x: display.size.width / 2,
y: display.size.height / 2
});
try {
// color-scheme is set to dark so background should not be white
expect(areColorsSimilar(centerColor, HexColors.WHITE)).to.be.false();
done();
} catch (err) {
done(err);
}
});
browserWindow.webContents.executeJavaScript("window.open('about:blank') && true");
});
});