From 4b92388396c6da783809c7ce511b5cf6be8a0624 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Fri, 2 Jun 2023 16:11:43 +0300 Subject: Fix crash on ScaleFactorChange on Windows Windows is known to send zero sizes from winit in Risezed and now in ScaleFactorChanged events. They were handled in Resized, but not in ScaleFactorChanged. Fixes #6949. --- CHANGELOG.md | 1 + alacritty/src/event.rs | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52dbb9fc..cda212ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixed - Hyperlink preview not being shown when the terminal has exactly 2 lines +- Crash on Windows when changing display scale factor ## 0.12.1 diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs index c10bfed9..5fac1ced 100644 --- a/alacritty/src/event.rs +++ b/alacritty/src/event.rs @@ -1193,16 +1193,22 @@ impl input::Processor> { match event { WinitEvent::UserEvent(Event { payload, .. }) => match payload { EventType::ScaleFactorChanged(scale_factor, (width, height)) => { + self.ctx.window().scale_factor = scale_factor; + let display_update_pending = &mut self.ctx.display.pending_update; // Push current font to update its scale factor. let font = self.ctx.config.font.clone(); display_update_pending.set_font(font.with_size(*self.ctx.font_size)); - // Resize to event's dimensions, since no resize event is emitted on Wayland. - display_update_pending.set_dimensions(PhysicalSize::new(width, height)); - - self.ctx.window().scale_factor = scale_factor; + // Ignore resize events to zero in any dimension, to avoid issues with Winit + // and the ConPTY. A 0x0 resize will also occur when the window is minimized + // on Windows. + if width != 0 && height != 0 { + // Resize to event's dimensions, since no resize event is emitted on + // Wayland. + display_update_pending.set_dimensions(PhysicalSize::new(width, height)); + } }, EventType::Frame => { self.ctx.display.window.has_frame.store(true, Ordering::Relaxed); -- cgit v1.2.3-54-g00ecf