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

fix: win.isMaximized() for transparent windows on Windows (#38234)

Browse source
This commit is contained in:
Shelley Vohr 2023-05-17 10:17:08 +02:00 committed by GitHub
parent 9902e01d2c
commit ad07712561
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/native_window_views.cc
View file

@ -656,7 +656,7 @@ bool NativeWindowViews::IsMaximized() {
return true; return true;
} else { } else {
#if BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_WIN)
if (transparent()) { if (transparent() && !IsMinimized()) {
// Compare the size of the window with the size of the display // Compare the size of the window with the size of the display
auto display = display::Screen::GetScreen()->GetDisplayNearestWindow( auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(
GetNativeWindow()); GetNativeWindow());

18
spec/api-browser-window-spec.ts
View file

@ -6059,6 +6059,24 @@ describe('BrowserWindow module', () => {
describe('"transparent" option', () => { describe('"transparent" option', () => {
afterEach(closeAllWindows); afterEach(closeAllWindows);
ifit(process.platform !== 'linux')('correctly returns isMaximized() when the window is maximized then minimized', async () => {
const w = new BrowserWindow({
frame: false,
transparent: true
});
const maximize = once(w, 'maximize');
w.maximize();
await maximize;
const minimize = once(w, 'minimize');
w.minimize();
await minimize;
expect(w.isMaximized()).to.be.false();
expect(w.isMinimized()).to.be.true();
});
// Only applicable on Windows where transparent windows can't be maximized. // Only applicable on Windows where transparent windows can't be maximized.
ifit(process.platform === 'win32')('can show maximized frameless window', async () => { ifit(process.platform === 'win32')('can show maximized frameless window', async () => {
const display = screen.getPrimaryDisplay(); const display = screen.getPrimaryDisplay();