Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Copy/paste images into editors (Mac only) #15782

Merged
merged 44 commits into from
Aug 13, 2024
Merged

Copy/paste images into editors (Mac only) #15782

merged 44 commits into from
Aug 13, 2024

Conversation

rtfeldman
Copy link
Contributor

@rtfeldman rtfeldman commented Aug 4, 2024 •
edited
Loading

For future reference: WIP branch of copy/pasting a mixture of images and text: https://github.com/zed-industries/zed/tree/copy-paste-images - we'll come back to that one after landing this one.

Release Notes:

  • You can now paste images into the Assistant Panel to include them as context. Currently works only on Mac, and with Anthropic models. Future support is planned for more models, operating systems, and image clipboard operations.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Aug 4, 2024
@rtfeldman rtfeldman changed the title Copy/paste images into editors Copy/paste images into editors (Mac only) Aug 4, 2024
rtfeldman and others added 11 commits August 4, 2024 17:46
@rtfeldman
Fix UTType strategy
d9c42a8
@rtfeldman
Fix a test
61b204b
@rtfeldman
Add paste hook in assistant panel
e7e59aa
@rtfeldman @as-cii
Add ClipboardImage::to_image_data
d60a29b 
co-authored-by: Antonio <antonio@zed.dev>
@rtfeldman
Introduce ClipboardImage
5664f1f
@mikayla-maki @rtfeldman
Split img into img and surface, add image rendering to assistant panel
257e8aa 
co-authored-by: Richard <richard@zed.dev>
@mikayla-maki
Prep types to re-use the GPUI cache, expand the general message type …
092610b 
…to incorporate images
@rtfeldman
Fix inserting/deleting image behavior
2d6e83d
@rtfeldman @as-cii @jvmncs
Fix sizing on pasted images
fbf71cf 
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Jason <jason@zed.dev>
@rtfeldman
Gracefully handle image not being able to be converted to RGBA
63837e5
@mikayla-maki @rgbkrk
@rtfeldman @jvmncs
WIP
e600b35 
co-authored-by: Kyle <kylek@zed.dev>
co-authored-by: Richard <richard@zed.dev>
co-authored-by: Jason <jason@zed.dev>
@nickelser
Copy link

ahh so excited for this 😄

@rtfeldman rtfeldman marked this pull request as ready for review August 13, 2024 16:11
@rtfeldman rtfeldman merged commit b1a581e into main Aug 13, 2024
10 checks passed
@rtfeldman rtfeldman deleted the paste-image branch August 13, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikayla-maki mikayla-maki Awaiting requested review from mikayla-maki

Assignees

@rtfeldman rtfeldman

Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rtfeldman @nickelser @mikayla-maki