alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-23 22:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix WindowBuilder::with_resize_increments (#2477)

Browse source 
Introduced in https://github.com/rust-windowing/winit/pull/2411
This commit is contained in:
Mads Marquart 2022-09-08 18:54:22 +02:00 committed by GitHub
parent a6a8b12537
commit da7bf8e29b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/platform_impl/macos/window.rs
View file

@ -77,7 +77,6 @@ pub struct PlatformSpecificWindowBuilderAttributes {
pub titlebar_hidden: bool,
pub titlebar_buttons_hidden: bool,
pub fullsize_content_view: bool,
pub resize_increments: Option<LogicalSize<f64>>,
pub disallow_hidpi: bool,
pub has_shadow: bool,
}
@ -92,7 +91,6 @@ impl Default for PlatformSpecificWindowBuilderAttributes {
titlebar_hidden: false,
titlebar_buttons_hidden: false,
fullsize_content_view: false,
resize_increments: None,
disallow_hidpi: false,
has_shadow: true,
}
@ -331,10 +329,11 @@ impl WinitWindow {
this.setLevel(NSWindowLevel::Floating);
}
if let Some(increments) = pl_attrs.resize_increments {
if let Some(increments) = attrs.resize_increments {
let increments = increments.to_logical(this.scale_factor());
let (w, h) = (increments.width, increments.height);
if w >= 1.0 && h >= 1.0 {
let size = NSSize::new(w as CGFloat, h as CGFloat);
let size = NSSize::new(w, h);
// It was concluded (#2411) that there is never a use-case for
// "outer" resize increments, hence we set "inner" ones here.
// ("outer" in macOS being just resizeIncrements, and "inner" - contentResizeIncrements)