wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-22 22:42:48 +03:00
Code Issues Projects Releases Wiki Activity

macos: make initial position consistent with window:set_position

Browse Source 
refs: https://github.com/wez/wezterm/issues/2976
This commit is contained in:
Wez Furlong 2023-02-07 12:59:54 -07:00
parent d00845baad
commit 3eede5c248
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
window/src/os/macos/window.rs
View File

@ -397,6 +397,21 @@ pub struct Window {
unsafe impl Send for Window {}
unsafe impl Sync for Window {}
fn set_window_position(window: *mut Object, coords: ScreenPoint) {
unsafe {
let cartesian = screen_point_to_cartesian(coords);
let frame = NSWindow::frame(window);
let content_frame = NSWindow::contentRectForFrameRect_(window, frame);
let delta_x = content_frame.origin.x - frame.origin.x;
let delta_y = content_frame.origin.y - frame.origin.y;
let point = NSPoint::new(
cartesian.x as f64 - delta_x,
cartesian.y as f64 - delta_y - content_frame.size.height,
);
NSWindow::setFrameOrigin_(window, point);
}
}
impl Window {
pub async fn new_window<F>(
_class_name: &str,
@ -421,10 +436,8 @@ impl Window {
x,
y,
} = conn.resolve_geometry(geometry);
let pos = match (x, y) {
(Some(x), Some(y)) => Some(screen_point_to_cartesian(ScreenPoint::new(
x as isize, y as isize,
))),
let initial_pos = match (x, y) {
(Some(x), Some(y)) => Some(ScreenPoint::new(x as isize, y as isize)),
_ => None,
};
@ -513,7 +526,13 @@ impl Window {
}
LAST_POSITION.with(|last_pos| {
let pos = pos.or_else(|| last_pos.borrow_mut().take());
if let Some(pos) = initial_pos {
// Put it where they asked it to be, without influencing
// future positioning info
set_window_position(*window, pos);
return;
}
let pos = last_pos.borrow_mut().take();
let next_pos = match pos {
Some(pos) if point_in_rect(pos, active_screen_frame) => {
// Only continue the cascade if the prior point is
@ -1109,18 +1128,7 @@ impl WindowInner {
}
fn set_window_position(&self, coords: ScreenPoint) {
unsafe {
let cartesian = screen_point_to_cartesian(coords);
let frame = NSWindow::frame(*self.window);
let content_frame = NSWindow::contentRectForFrameRect_(*self.window, frame);
let delta_x = content_frame.origin.x - frame.origin.x;
let delta_y = content_frame.origin.y - frame.origin.y;
let point = NSPoint::new(
cartesian.x as f64 - delta_x,
cartesian.y as f64 - delta_y - content_frame.size.height,
);
NSWindow::setFrameOrigin_(*self.window, point);
}
set_window_position(*self.window, coords);
}
fn set_text_cursor_position(&mut self, cursor: Rect) {