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

fix: Linux visibleOnAllWorkspaces property (#46850)

Browse source 
* test: do not skip visibleOnAllWorkspaces tests on Windows

That feature is supported on Linux, so move the test from the
"window states (excluding Linux)" section into the
"window states" section.

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* chore: disable visibleOnAllWorkspaces test on Linux

* fix: NativeWindowViews::IsVisibleOnAllWorkspaces

* test: enable visibleOnAllWorkspaces tests on Linux

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
This commit is contained in:
Charles Kerr 2025-04-29 13:08:53 -05:00 • committed by GitHub
parent 069ca16b9e
commit 98380468bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/native_window_views.cc
View file

@ -1538,6 +1538,13 @@ void NativeWindowViews::SetVisibleOnAllWorkspaces(
} }
bool NativeWindowViews::IsVisibleOnAllWorkspaces() const { bool NativeWindowViews::IsVisibleOnAllWorkspaces() const {
// NB: Electron >= 37 has a better long-term fix, but it also has an edge
// case which is a breaking change. The code here is dirtier (e.g. accessing
// a method marked as private) to avoid that edge case. More info @
// https://github.com/electron/electron/pull/46834#issuecomment-2836287699
if (const auto* view_native_widget = widget()->native_widget_private())
return view_native_widget->IsVisibleOnAllWorkspaces();
#if BUILDFLAG(IS_LINUX) #if BUILDFLAG(IS_LINUX)
if (IsX11()) { if (IsX11()) {
// Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to // Use the presence/absence of _NET_WM_STATE_STICKY in _NET_WM_STATE to

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

@ -5408,8 +5408,7 @@ describe('BrowserWindow module', () => {
}); });
}); });
// FIXME: enable this test on Linux as well. ifdescribe(process.platform !== 'win32')('visibleOnAllWorkspaces state', () => {
ifdescribe(process.platform === 'darwin')('visibleOnAllWorkspaces state', () => {
describe('with properties', () => { describe('with properties', () => {
it('can be changed', () => { it('can be changed', () => {
const w = new BrowserWindow({ show: false }); const w = new BrowserWindow({ show: false });