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

fix: restore previous Windows screenshotting (#47033)

Browse source 
Fixes https://github.com/electron/electron/issues/45990

We previously made a change in https://github.com/electron/electron/pull/45868
to fix content protection being lost on hide and re-show. However, this
cause a breaking change where protected windows were made opaque black
instead of being hidden as before. This overrides relevant methods in
ElectronDesktopWindowTreeHostWin to restore the previous behavior.
without regressing the original issue.

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2025-05-09 13:10:44 -04:00 • committed by GitHub
commit ace7ef4316
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/ui/win/electron_desktop_window_tree_host_win.cc
View file

@ -126,6 +126,16 @@ bool ElectronDesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
return views::DesktopWindowTreeHostWin::HandleMouseEvent(event); return views::DesktopWindowTreeHostWin::HandleMouseEvent(event);
} }
void ElectronDesktopWindowTreeHostWin::HandleVisibilityChanged(bool visible) {
if (native_window_view_->widget())
native_window_view_->widget()->OnNativeWidgetVisibilityChanged(visible);
}
void ElectronDesktopWindowTreeHostWin::SetAllowScreenshots(bool allow) {
::SetWindowDisplayAffinity(GetAcceleratedWidget(),
allow ? WDA_NONE : WDA_EXCLUDEFROMCAPTURE);
}
void ElectronDesktopWindowTreeHostWin::OnNativeThemeUpdated( void ElectronDesktopWindowTreeHostWin::OnNativeThemeUpdated(
ui::NativeTheme* observed_theme) { ui::NativeTheme* observed_theme) {
HWND hWnd = GetAcceleratedWidget(); HWND hWnd = GetAcceleratedWidget();

2
shell/browser/ui/win/electron_desktop_window_tree_host_win.h
View file

@ -41,6 +41,8 @@ class ElectronDesktopWindowTreeHostWin : public views::DesktopWindowTreeHostWin,
int frame_thickness) const override; int frame_thickness) const override;
bool HandleMouseEventForCaption(UINT message) const override; bool HandleMouseEventForCaption(UINT message) const override;
bool HandleMouseEvent(ui::MouseEvent* event) override; bool HandleMouseEvent(ui::MouseEvent* event) override;
void HandleVisibilityChanged(bool visible) override;
void SetAllowScreenshots(bool allow) override;
// ui::NativeThemeObserver: // ui::NativeThemeObserver:
void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override; void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;