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

Correctly preview non-text files #1707

Merged
merged 66 commits into from
May 11, 2024
Merged

Correctly preview non-text files #1707

merged 66 commits into from
May 11, 2024

Conversation

plbstl
Copy link
Contributor

@plbstl plbstl commented May 10, 2024 •
edited
Loading

Description

This PR allows CodeEdit to preview non text files correctly.

All the file formats in the related issue #1698 were tested.

Related Issues

Checklist

  • I read and understood the contributing guide as well as the code of conduct
  • The issues this PR addresses are related to each other
  • My changes generate no new warnings
  • My code builds and runs on my machine
  • My changes are all related to the related issue above
  • I documented my code

Screenshots

QuickLook doesn't load until the Git branch shows up:

code-edit-view-file1.mov

plbstl added 30 commits May 7, 2024 19:15
@plbstl
Package.resolved changed
6f30d92
@plbstl
progress
7113389
@plbstl
minor doc change in CodeEditUI EffectView
9a85005
@plbstl
add WorkspacePdfFileView
6749915
@plbstl
allow WorkspacePdfFileView to be able to send data to SwiftUI
3d3893e
@plbstl
properly name WorkspacePdfFileView to WorkspacePDFView
bd3fe37
@plbstl
improve WorkspacePDFView docs
a12e51c
@plbstl
add guards to WorkspacePDFView (makeNSView, updateNSView)
2b59534
@plbstl
wip
6797552
@plbstl
wip 2
15291c0
@plbstl
correct padding
2fd13b4
@plbstl
progress? not
7ae71a0
@plbstl
add attachPDFDocumentToView helper in WorkspacePDFView
ff47ae8
@plbstl
update WorkspacePDFView docs
d820eb9
@plbstl
remove WorkspaceNonTextFileView
b5f1614
@plbstl
fix SwiftLint violations in WorkspacePDFView, WorkspaceCodeFileView
7ef3116
@plbstl
add magic numbers comment to WorkspaceCodeFileView
6d7f7d8
@plbstl
update WorkspacePDFView docs
2192c70
@plbstl
before i forget
74cd22b
@plbstl
progressss
8ef8461
@plbstl
too slow
a643b43
@plbstl
wip: the best work yet
f583df0
@plbstl
it really works!!
410f62d
@plbstl
add WorkspaceImageView
b80dc31
@plbstl
add WorkspaceCannotPreviewFileView
a9ed5ad
@plbstl
its working very predictably but showing/hiding navigator pane isn't …
ff57cc8 
…smooth
@plbstl
remove the use of canPreview as it can cause unexpected behaviour
1813416
@plbstl
remove computeFrame helper in WorkspaceCodeFileView
6106b64
@plbstl
update PDF preview's background color
dc7bcad
@plbstl
add note for when PDF preview cannot create PDF document
2e4dd02
plbstl added 14 commits May 10, 2024 08:15
@plbstl
remove text, image, PDF, video restrictions on CodeFileDocument.utType
1b8c8b3
@plbstl
update docs in WorkspaceImageView
2ac22a7
@plbstl
WorkspaceCodeFileView: group non-text files, so they inherit modifier…
c3d31a6 
…s from the parent Group view
@plbstl
WorkspaceCodeFileView: add important note on document.utType
12e0ba1
@plbstl
remove SwiftUI VideoPlayer view for now, it creates a bug that I can'…
8f04013 
…t work around

- the first play click doesn't start the video, but the audio starts playing in the background, even after closing the editor tab
- and everything in-between
@plbstl
add NonTextFileView to clean up code
acb8a63 
- NonTextFileView, OtherFileView, URL+isImage, are not needed anymore
@plbstl
remove QLPreviewItem subclass from CodeFileDocument
9688746
@plbstl
rename WorkspaceCodeFileView to EditorAreaFileView
425f806
@plbstl
rename EditorView to EditorAreaView
151e345 
- also added the view to the App Window docs
@plbstl
rename 4 Workspace view files
fe1f7bb 
- `WorkspaceAnyFileView` -> `AnyFileView`
- `WorkspaceLoadingView` -> `LoadingFileView`
- `WorkspaceImageView` -> `ImageFileView`
- `WorkspacePDFView` -> `PDFFileView`
@plbstl
move views for opening files to CodeEdit/Features/Editor
cb88ec2
@plbstl
move CodeFileDocument to CodeEdit/Features/Documents
096bb68
@plbstl
NSTableViewWrapper: minor change in comment
cf17bc7
@plbstl
move WindowCodeFileView to CodeEdit/Features/Editor/Views
950d7ed
@plbstl plbstl changed the title View non text files correctly Correctly preview non-text files May 10, 2024
@plbstl plbstl force-pushed the view-non-text-files-correctly branch from 8069cbc to dda4d34 Compare May 10, 2024 18:30
@plbstl
use AnyFileView to view all images
b373bb6 
- this removes the need to check for GIF images
- this also has a nice add-on of using gestures for zoom
@plbstl plbstl force-pushed the view-non-text-files-correctly branch from dda4d34 to b373bb6 Compare May 10, 2024 18:32
@thecoolwinter
Copy link
Collaborator

Looks like there's an issue with our CI, it might need an update, which would explain the failing test.

@austincondiff
Copy link
Collaborator

Nice work! I can't pull it down now but just so you are aware, images should show full pixels (not scaled up to fit if smaller than window). If it is too big for the window it should scale down to fit. We could later add some small controls to adjust the zoom levels and have buttons for 1x, 2x, and 3x.

@plbstl
Copy link
Contributor Author

plbstl commented May 11, 2024

images should show full pixels (not scaled up to fit if smaller than window). If it is too big for the window it should scale down to fit

Yes, this PR does that. Implementing it was really hard for me and it took the most time, but I'm happy it did so without a really complex logic.

CodeEdit/Features/Editor/Views/ImageFileView.swift

austincondiff
austincondiff approved these changes May 11, 2024
View reviewed changes
Copy link
Collaborator

@austincondiff austincondiff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect! Excellent work!

@austincondiff austincondiff merged commit 86b2780 into CodeEditApp:main May 11, 2024
2 checks passed
@austincondiff
Copy link
Collaborator

@allcontributors add @plbstl for bug

@allcontributors allcontributors bot mentioned this pull request May 11, 2024
Merged
@allcontributors AllContributors
Copy link
Contributor

@austincondiff

I've put up a pull request to add @plbstl! 🎉

@austincondiff austincondiff mentioned this pull request May 17, 2024
Closed
@plbstl plbstl mentioned this pull request Jul 5, 2024
Closed
@thecoolwinter thecoolwinter added the bug Something isn't working label Jul 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thecoolwinter thecoolwinter thecoolwinter approved these changes

@austincondiff austincondiff austincondiff approved these changes

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@plbstl @thecoolwinter @austincondiff