Skip to content

fix: Handle views with flipped coordinates #174

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

Merged
mwcampbell merged 1 commit into from
Nov 25, 2022
Merged

fix: Handle views with flipped coordinates #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions platforms/macos/src/adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,15 @@ impl Adapter {
let window = view.window().unwrap();
let point = window.convert_point_from_screen(point);
let point = view.convert_point_from_view(point, None);
let view_bounds = view.bounds();
let point = Point::new(point.x, view_bounds.size.height - point.y);
let point = Point::new(
point.x,
if view.is_flipped() {
point.y
} else {
let view_bounds = view.bounds();
view_bounds.size.height - point.y
},
);

let state = context.tree.read();
let root = state.root();
Expand Down
3 changes: 3 additions & 0 deletions platforms/macos/src/appkit/view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,8 @@ extern_methods!(
point: NSPoint,
view: Option<&NSView>,
) -> NSPoint;

#[sel(isFlipped)]
pub(crate) fn is_flipped(&self) -> bool;
}
);
8 changes: 6 additions & 2 deletions platforms/macos/src/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,15 @@ declare_class!(
};

node.bounding_box().map_or(NSRect::ZERO, |rect| {
let view_bounds = view.bounds();
let rect = NSRect {
origin: NSPoint {
x: rect.x0,
y: view_bounds.size.height - rect.y1,
y: if view.is_flipped() {
rect.y0
} else {
let view_bounds = view.bounds();
view_bounds.size.height - rect.y1
},
},
size: NSSize {
width: rect.width(),
Expand Down