SDA-4481: Add Fix to image cannot be copied #2109
Merged
Conversation
This file contains 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
| @@ -376,12 +376,17 @@ export class ContextMenuBuilder { | |||
| * Adds "Copy Image" and "Copy Image URL" items when `src` is valid. | |||
| */ | |||
| public addImageItems(menu, menuInfo) { | |||
| const target = this.getWebContents(); | |||
| const current = this.getWebContents(); | |||
There was a problem hiding this comment.
Suggested change
| const current = this.getWebContents(); | |
| const focusedWindow = BrowserWindow.getFocusedWindow() as ICustomBrowserWindow; | |
| if(focusedWindow && focusedWindow.winName !== apiName.mainWindowName) { | |
| focusedWindow.webContents.send('copy-to-clipboard', menuInfo.srcURL); | |
| } else { | |
| focusedWindow.webContents.copyImageAt(menuInfo.x, menuInfo.y); | |
| } |
There was a problem hiding this comment.
This way you ensure that window is the main window and not a child window
There was a problem hiding this comment.
I suggest using focused window to check main,
remaining logic might not be different due to getWebcontent using exact same as BrowserWindow focus if current webcontent is not found
NguyenTranHoangSym
force-pushed
the
SDA-4481
branch
from
e226cba to
dda7245
Compare
KiranNiranjan
approved these changes
Mar 12, 2024
| const copyImage = new MenuItem({ | ||
| label: this.stringTable.copyImage(), | ||
| click: (_e) => { | ||
| if (focusedWindow && focusedWindow.winName === apiName.mainWindowName) { | ||
| current?.send('copy-to-clipboard', menuInfo.srcURL); |
There was a problem hiding this comment.
Suggested change
| current?.send('copy-to-clipboard', menuInfo.srcURL); | |
| focusedWindow.webContents.send('copy-to-clipboard', menuInfo.srcURL); |
sbenmoussati
approved these changes
Apr 4, 2024
NguyenTranHoangSym
force-pushed
the
SDA-4481
branch
from
dda7245 to
87e27ef
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
The fix targets to remove regression on cannot copy image of Workspace / Popout. This fix does not include pasting from workspace/popout to 3rd parties, currently tech limitation.
Related PRs
Demo
TinyTake.by.MangoApps-11-03-2024-04-56-25.mp4