-
-
Notifications
You must be signed in to change notification settings - Fork 133
feat(overlay): add "Hide from screen recording" preference #522
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ const { app, BrowserWindow, screen } = require( 'electron' ) | |
|
|
||
| const { activeWindow, centerWindow, is } = require( './util' ) | ||
| const { APP_HEIGHT, APP_WIDTH, MAX_SHADOW_WINDOWS, APP_ASPECT_RATIO } = require( '../config/config.js' ) | ||
| const { checkboxTrue } = require( '../config/utils.js' ) | ||
| const { productName } = require( '../../package.json' ) | ||
| const dock = require( './dock.js' ) | ||
| const log = require( './log.js' ) | ||
|
|
@@ -77,6 +78,43 @@ const getActiveWindow = () => { | |
|
|
||
| } | ||
|
|
||
| // Toggle whether a window is excluded from screen captures / recordings (#359) | ||
| // Uses Electron's setContentProtection, which maps to WDA_MONITOR / WDA_EXCLUDEFROMCAPTURE | ||
| // on Windows and NSWindowSharingNone on macOS. | ||
| const applyContentProtection = ( win, enabled = checkboxTrue( preferences.value( 'app.hideFromScreenCapture' ), 'hideFromScreenCapture' ) ) => { | ||
|
|
||
| if ( !win || win.isDestroyed() ) { | ||
|
|
||
| return | ||
|
|
||
| } | ||
|
|
||
| try { | ||
|
|
||
| win.setContentProtection( Boolean( enabled ) ) | ||
|
|
||
| } catch ( error ) { | ||
|
|
||
| log.error( `setContentProtection failed: ${error?.message}` ) | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| // Apply the current hideFromScreenCapture preference to every crosshair window | ||
| const syncContentProtection = () => { | ||
|
|
||
| const enabled = checkboxTrue( preferences.value( 'app.hideFromScreenCapture' ), 'hideFromScreenCapture' ) | ||
| applyContentProtection( windows.win, enabled ) | ||
|
|
||
| for ( const currentWindow of windows.shadowWindows ) { | ||
|
|
||
| applyContentProtection( currentWindow, enabled ) | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
Comment on lines
+84
to
+116
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are a few improvements we can make to
const applyContentProtection = ( win, enabled = checkboxTrue( preferences.value( 'app.hideFromScreenCapture' ) || [], 'hideFromScreenCapture' ) ) => {
if ( !win || win.isDestroyed() || typeof win.setContentProtection !== 'function' ) {
return
}
try {
win.setContentProtection( Boolean( enabled ) )
} catch ( error ) {
log.error( `setContentProtection failed: ${error?.message}` )
}
}
// Apply the current hideFromScreenCapture preference to every crosshair window
const syncContentProtection = ( value ) => {
const enabled = checkboxTrue( value !== undefined ? value : ( preferences.value( 'app.hideFromScreenCapture' ) || [] ), 'hideFromScreenCapture' )
applyContentProtection( windows.win, enabled )
for ( const currentWindow of windows.shadowWindows ) {
applyContentProtection( currentWindow, enabled )
}
} |
||
|
|
||
| // Prevent window from being garbage collected | ||
| // Default no shadow window | ||
| const create = ( { isShadowWindow } = { isShadowWindow: false } ) => { | ||
|
|
@@ -141,6 +179,9 @@ const create = ( { isShadowWindow } = { isShadowWindow: false } ) => { | |
| win.setAlwaysOnTop( true, 'screen-saver', 1 ) | ||
| win.setFullScreenable( false ) | ||
|
|
||
| // Exclude the crosshair from screen recordings / captures when enabled (#359) | ||
| applyContentProtection( win ) | ||
|
|
||
| win.once( 'ready-to-show', () => { | ||
|
|
||
| log.info( 'Event: Ready to show' ) | ||
|
|
@@ -594,6 +635,8 @@ const unregister = () => { | |
|
|
||
| const windows = { | ||
|
|
||
| applyContentProtection, | ||
| syncContentProtection, | ||
| init, | ||
| load, | ||
| each, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To maintain consistency with the rest of the
syncSettingsfunction (which reads all configuration values from the passedoptionsobject rather than directly from the globalpreferencesstore), we should passoptions.app?.hideFromScreenCapturetowindows.syncContentProtection().