Skip to content

ios: honour Conf::high_dpi on the Metal path #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benface wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ios: honour Conf::high_dpi on the Metal path #654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/native/ios.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ unsafe fn create_opengl_view(screen_rect: NSRect, _sample_count: i32, high_dpi:
}
}

unsafe fn create_metal_view(screen_rect: NSRect, sample_count: i32, _high_dpi: bool) -> View {
unsafe fn create_metal_view(screen_rect: NSRect, sample_count: i32) -> View {
let mtk_view_obj: ObjcId = msg_send![define_glk_or_mtk_view(class!(MTKView)), alloc];
let mtk_view_obj: ObjcId = msg_send![mtk_view_obj, initWithFrame: screen_rect];

Expand Down Expand Up @@ -586,7 +586,7 @@ pub fn define_app_delegate() -> *const Class {
create_opengl_view(screen_rect, conf.sample_count, conf.high_dpi)
}
AppleGfxApi::Metal => {
create_metal_view(screen_rect, conf.sample_count, conf.high_dpi)
create_metal_view(screen_rect, conf.sample_count)
}
};

Expand Down Expand Up @@ -728,6 +728,14 @@ pub fn define_app_delegate() -> *const Class {
msg_send_![window, addSubview: view];
msg_send_![window, setRootViewController: view_ctrl];
msg_send_![window, makeKeyAndVisible];

// `MTKView` loses a `contentScaleFactor` set before it has a window: moving it in
// re-derives the scale from that window's screen. A no-op for `GLKView`, which keeps
// what `create_opengl_view` set. Here rather than at creation because the resize this
// triggers reaches the backend, which is initialized by now.
if !crate::native_display().lock().unwrap().high_dpi {
msg_send_![view, setContentScaleFactor: 1.0];
}
}
}

Expand Down
Loading