NS Scroll View Magnification #37
Draft
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
Fix issue where a layout manager's NSTextStorage could be `nil` at initialization but later set by introducing the `_setTextStorage:` method to NSTextView. Add stubs a for missing properties in NSTextView. Refactor `firstTextView` to properly find and return the first text view, or `nil` if there are no text views. Use 64-bit ready types where applicable. Relocate unrelated code from _setTextStorage
Adds code in `initWithData` to infer document format for RTF, HTML, and plaintext documents. Additionally refactors NSAttributedString to use the correct attribute types as described in Apple's documentation.
Add stubs for content size, frame size, and magnification size, and add basic implementations where feasible.
Implement NSTextTab handling based on the GNUStep implementation, with formatting and other adjustments.
CuriousTommy
requested changes
Feb 10, 2024
.vscode/settings.json
Outdated
Comment on lines
1
to
7
| { | ||
| "files.associations": { | ||
| "*.embeddedhtml": "html", | ||
| "type_traits": "cpp", | ||
| "xtr1common": "cpp" | ||
| } | ||
| } |
There was a problem hiding this comment.
Looks like you accidentally commit your .vscode/settings.json. Don't forget to remove it and rebase your changes.
CuriousTommy
requested changes
Feb 11, 2024
Comment on lines
+666
to
+656
| _bounds.origin.x = _bounds.origin.x / size.width; | ||
| _bounds.origin.y = _bounds.origin.y / size.height; |
There was a problem hiding this comment.
Related to the above note, this would probably needs some adjustments to support negative values.
AppKit/NSScrollView.m
Outdated
Comment on lines
1059
to
1127
| // scale the content view centered at the given point | ||
| NSRect frame = [_clipView frame]; | ||
| NSSize scaledSize = NSMakeSize(frame.size.width*magnification, frame.size.height*magnification); | ||
| NSPoint centeredOrigin = NSMakePoint(point.x - (newSize.width/2), point.y - (newSize.height/2)); | ||
| [_clipView setFrame:NSMakeRect(centeredOrigin.x, centeredOrigin.y, scaledSize.width, scaledSize.height)]; |
There was a problem hiding this comment.
Were you able to verify that the contentView does indeed get updated on macOS?
I'm having trouble verifying that it's frame get updated... =/
NSScrollView *_scrollView = [[NSScrollView alloc] init];
[_scrollView setFrame: NSMakeRect(0.0, 0.0, 480, 270)];
[[_scrollView documentView] setFrame: NSMakeRect(0.0, 0.0, 500, 1200)];
printFrame(_scrollView);[scrollView minMagnification]: 0.250000
[scrollView maxMagnification]: 4.000000
[scrollView magnification]: 1.000000
[scrollView frame]->origin.x: 0.000000
[scrollView frame]->origin.y: 0.000000
[scrollView frame]->size.width: 480.000000
[scrollView frame]->size.height: 270.000000
[[scrollView contentView] frame]->origin.x: 0.000000
[[scrollView contentView] frame]->origin.y: 0.000000
[[scrollView contentView] frame]->size.width: 480.000000
[[scrollView contentView] frame]->size.height: 270.000000
[[scrollView documentView] frame]->origin.x: 0.000000
[[scrollView documentView] frame]->origin.y: 0.000000
[[scrollView documentView] frame]->size.width: 0.000000
[[scrollView documentView] frame]->size.height: 0.000000
[_scrollView setMagnification:10.0 centeredAtPoint:NSMakePoint(50, 50)];
printFrame(_scrollView);[scrollView minMagnification]: 0.250000
[scrollView maxMagnification]: 4.000000
[scrollView magnification]: 4.000000
[scrollView frame]->origin.x: 0.000000
[scrollView frame]->origin.y: 0.000000
[scrollView frame]->size.width: 480.000000
[scrollView frame]->size.height: 270.000000
[[scrollView contentView] frame]->origin.x: 0.000000
[[scrollView contentView] frame]->origin.y: 0.000000
[[scrollView contentView] frame]->size.width: 480.000000
[[scrollView contentView] frame]->size.height: 270.000000
[[scrollView documentView] frame]->origin.x: 0.000000
[[scrollView documentView] frame]->origin.y: 0.000000
[[scrollView documentView] frame]->size.width: 0.000000
[[scrollView documentView] frame]->size.height: 0.000000
…tMagnfication through rect and point, and allowed negative values to be passed to scaleUnitSize
CKegel
force-pushed
the
NSScrollView-Magnification
branch
2 times, most recently
from
1ca619e
to
4ee3782
Compare
CKegel
force-pushed
the
NSScrollView-Magnification
branch
from
4ee3782
to
c190383
Compare
|
@CKegel @jvmespark Let me know when you are ready for me to review this PR. |
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.
working to close:
https://github.com/users/CKegel/projects/1/views/1?pane=issue&itemId=51682446