wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

window: macos: trigger resize event when screen resolution changes

Browse Source 
The easiest repro for this is dragging a window between monitors.

refs: #161
This commit is contained in:
Wez Furlong 2020-10-12 11:29:17 -07:00
parent 06cd143dd5
commit da2bba866d
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,6 +298,7 @@ impl Window {
callbacks, callbacks,
view_id: None, view_id: None,
window_id, window_id,
screen_changed: false,
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
gl_context_pair: None, gl_context_pair: None,
text_cursor_position: Rect::new(Point::new(0, 0), Size::new(0, 0)), text_cursor_position: Rect::new(Point::new(0, 0), Size::new(0, 0)),
@ -598,6 +599,7 @@ struct Inner {
callbacks: Box<dyn WindowCallbacks>, callbacks: Box<dyn WindowCallbacks>,
view_id: Option<WeakPtr>, view_id: Option<WeakPtr>,
window_id: usize, window_id: usize,
screen_changed: bool,
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
gl_context_pair: Option<opengl::GlContextPair>, gl_context_pair: Option<opengl::GlContextPair>,
text_cursor_position: Rect, text_cursor_position: Rect,
@ -1146,6 +1148,17 @@ impl WindowView {
} }
*/ */
extern "C" fn did_change_screen(this: &mut Object, _sel: Sel, _notification: id) {
log::trace!("did_change_screen");
if let Some(this) = Self::get_this(this) {
// Just set a flag; we don't want to react immediately
// as this even fires as part of a live move and the
// resize flow may try to re-position the window to
// the wrong place.
this.inner.borrow_mut().screen_changed = true;
}
}
extern "C" fn did_resize(this: &mut Object, _sel: Sel, _notification: id) { extern "C" fn did_resize(this: &mut Object, _sel: Sel, _notification: id) {
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
{ {
@ -1181,6 +1194,18 @@ impl WindowView {
if let Some(this) = Self::get_this(view) { if let Some(this) = Self::get_this(view) {
let mut inner = this.inner.borrow_mut(); let mut inner = this.inner.borrow_mut();
if inner.screen_changed {
// If the screen resolution changed (which can also
// happen if the window was dragged to another monitor
// with different dpi), then we treat this as a resize
// event that will in turn trigger an invalidation
// and a repaint.
inner.screen_changed = false;
drop(inner);
Self::did_resize(view, sel, nil);
return;
}
#[cfg(feature = "opengl")] #[cfg(feature = "opengl")]
{ {
if let Some(gl_context_pair) = inner.gl_context_pair.as_ref() { if let Some(gl_context_pair) = inner.gl_context_pair.as_ref() {
@ -1314,6 +1339,10 @@ impl WindowView {
sel!(windowDidResize:), sel!(windowDidResize:),
Self::did_resize as extern "C" fn(&mut Object, Sel, id), Self::did_resize as extern "C" fn(&mut Object, Sel, id),
); );
cls.add_method(
sel!(windowDidChangeScreen:),
Self::did_change_screen as extern "C" fn(&mut Object, Sel, id),
);
cls.add_method( cls.add_method(
sel!(windowDidBecomeKey:), sel!(windowDidBecomeKey:),