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

Don't apply our weird window positioning hacks for clicks on traffic lights #17181

Merged
merged 1 commit into from
Oct 3, 2024
+19 −1
Merged

Don't apply our weird window positioning hacks for clicks on traffic lights #17181

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
20 changes: 19 additions & 1 deletion native/Avalonia.Native/src/OSX/AvnWindow.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,16 @@ - (AvnPoint) translateLocalPoint:(AvnPoint)pt
return pt;
}

- (NSView*) findRootView:(NSView*)view
{
while (true) {
auto parent = [view superview];
if(parent == nil)
return view;
view = parent;
}
}

- (void)sendEvent:(NSEvent *_Nonnull)event
{
[super sendEvent:event];
Expand All @@ -467,7 +477,15 @@ - (void)sendEvent:(NSEvent *_Nonnull)event
AvnView* view = parent->View;
NSPoint windowPoint = [event locationInWindow];
NSPoint viewPoint = [view convertPoint:windowPoint fromView:nil];


auto targetView = [[self findRootView:view] hitTest: windowPoint];
if(targetView)
{
auto targetViewClass = [targetView className];
if([targetViewClass containsString: @"_NSThemeWidget"])
return;
}

if (!NSPointInRect(viewPoint, view.bounds))
{
auto avnPoint = ToAvnPoint(windowPoint);
Expand Down
Loading