NotificationsYou must be signed in to change notification settings
Fork8.1k
Star22.1k

Commit70a8e32

committed

FIX: Disable cursorRect updates from within macosx backend

We want to keep control of the cursor updates from within MPL, sodon't allow the App to push a new cursor update when the windowgets updated. This would happen when a TextView would get resizedand update the frame.

1 parent06ea324 commit70a8e32Copy full SHA for 70a8e32

File tree

1 file changed

-3

lines changed

src
- _macosx.m

1 file changed

-3

lines changed

`‎src/_macosx.m‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,10 @@ static CGFloat _get_device_scale(CGContextRef cr)`
`565`	`565`	`Window* window = self->window;`
`566`	`566`	`[windowsetDelegate: view];`
`567`	`567`	`[windowmakeFirstResponder: view];`
	`568`	`+// Disable cursorRects so that the cursor doesn't get updated by events`
	`569`	`+// in NSApp (like resizing TextViews), we want to handle the cursor`
	`570`	`+// changes from within MPL with set_cursor() ourselves`
	`571`	`+ [windowdisableCursorRects];`
`568`	`572`	`[[windowcontentView]addSubview: view];`
`569`	`573`	`[viewupdateDevicePixelRatio: [windowbackingScaleFactor]];`
`570`	`574`
`@@ -956,9 +960,6 @@ -(void)save_figure:(id)sender { gil_call_method(toolbar, "save_figure"); }`
`956`	`960`	`[messageboxsetFrame: rect];`
`957`	`961`	`// We want to control the vertical position of`
`958`	`962`	`// the rect by the content size to center it vertically`
`959`		`-// TODO: This seems to disable the cursor updates with newlines that`
`960`		`-// are included in the image hover text. It is only when trying`
`961`		`-// to set the frame height based on the contentRect's size.`
`962`	`963`	`[messagebox.layoutManagerensureLayoutForTextContainer: messagebox.textContainer];`
`963`	`964`	`NSRect contentRect = [messagebox.layoutManagerusedRectForTextContainer: messagebox.textContainer];`
`964`	`965`	`rect.origin.y =0.5 * (self->height - contentRect.size.height);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit70a8e32

File tree

1 file changed

1 file changed

`‎src/_macosx.m‎`

0 commit comments