Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui: Refresh mouse position after bounds changes (#60421)

迷渡961f4f202465
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index fcf10ac5576..f4bd64ecba5 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2250,6 +2250,7 @@ impl Window {
self.scale_factor = self.platform_window.scale_factor();
self.viewport_size = self.platform_window.content_size();
self.display_id = self.platform_window.display().map(|display| display.id());
+ self.mouse_position = self.platform_window.mouse_position();
self.refresh();
diff --git a/crates/gpui_linux/src/linux/x11/window.rs b/crates/gpui_linux/src/linux/x11/window.rs
index 147630d054d..d2edb72408b 100644
--- a/crates/gpui_linux/src/linux/x11/window.rs
+++ b/crates/gpui_linux/src/linux/x11/window.rs
@@ -1410,7 +1410,11 @@ impl PlatformWindow for X11Window {
)
.log_err()
.map_or(Point::new(Pixels::ZERO, Pixels::ZERO), |reply| {
- Point::new((reply.root_x as u32).into(), (reply.root_y as u32).into())
+ let scale_factor = self.0.state.borrow().scale_factor;
+ Point::new(
+ px(reply.win_x as f32 / scale_factor),
+ px(reply.win_y as f32 / scale_factor),
+ )
})
}