-
Notifications
You must be signed in to change notification settings - Fork 792
vz: Fix scrollbar issue with runtime swizzle #4476
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
Open
stuffbucket
wants to merge
1
commit into
lima-vm:master
Choose a base branch
from
stuffbucket:pr/vz-scrollbar-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // SPDX-FileCopyrightText: Copyright The Lima Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build darwin | ||
|
|
||
| // This file includes scrollbar_fix_darwin.m via cgo. | ||
| // See that file for documentation on why this patch is needed. | ||
|
|
||
| package vz | ||
|
|
||
| /* | ||
| #cgo CFLAGS: -x objective-c | ||
| #cgo LDFLAGS: -framework Cocoa -lobjc | ||
| #include "scrollbar_fix_darwin.m" | ||
| */ | ||
| import "C" |
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // SPDX-FileCopyrightText: Copyright The Lima Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| // scrollbar_fix_darwin.m - Runtime patch to disable scrollbars on VZ display window | ||
| // | ||
| // The Code-Hex/vz library wraps VZVirtualMachineView in an NSScrollView with | ||
| // scrollbars hardcoded to YES (for their zoom feature). This causes ~16px of | ||
| // the VM display to be cut off by scrollbar gutters. | ||
| // | ||
| // This file uses Objective-C method swizzling to intercept NSScrollView's | ||
| // setDocumentView: method and disable scrollbars when the document view is | ||
| // a VZVirtualMachineView. | ||
| // | ||
| // This is a temporary workaround until Code-Hex/vz adds a configuration option | ||
| // to disable scrollbars. See: https://github.com/Code-Hex/vz/issues/XXX | ||
|
|
||
| #import <Cocoa/Cocoa.h> | ||
| #import <objc/runtime.h> | ||
|
|
||
| // Store original implementation pointer | ||
| static IMP original_setDocumentView = NULL; | ||
|
|
||
| // Patched implementation that disables scrollbars for VZ views | ||
| static void patched_setDocumentView(id self, SEL _cmd, NSView *view) { | ||
| // Call original implementation first | ||
| ((void (*)(id, SEL, NSView *))original_setDocumentView)(self, _cmd, view); | ||
|
|
||
| // If the document view is a VZVirtualMachineView, disable scrollbars | ||
| // The scrollbars cause the VM display to be cut off by ~16px | ||
| if (view != nil && [view isKindOfClass:NSClassFromString(@"VZVirtualMachineView")]) { | ||
| [(NSScrollView *)self setHasVerticalScroller:NO]; | ||
| [(NSScrollView *)self setHasHorizontalScroller:NO]; | ||
| } | ||
| } | ||
|
|
||
| // Constructor attribute ensures this runs before main() | ||
| // This patches NSScrollView before Code-Hex/vz creates any windows | ||
|
Member
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. Not a fan of monkey patching AppKit, could this be fixed in Code-Hex/vz ? |
||
| __attribute__((constructor)) | ||
| static void patchNSScrollViewForVZ(void) { | ||
| Method m = class_getInstanceMethod([NSScrollView class], @selector(setDocumentView:)); | ||
| if (m != NULL) { | ||
| original_setDocumentView = method_setImplementation(m, (IMP)patched_setDocumentView); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
The link is broken