migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Use the egui-standard builder pattern for ViewportBuilder

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-14 19:55:40 +01:00
parent 54f6e6b9ae
commit dacce7b1f4
5 changed files with 66 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/egui-winit/src/window_settings.rs
View File

@@ -48,7 +48,10 @@ impl WindowSettings {
self.inner_size_points
}
pub fn initialize_viewport_builder(&self, viewport_builder: &mut ViewportBuilder) {
pub fn initialize_viewport_builder(
&self,
mut viewport_builder: ViewportBuilder,
) -> ViewportBuilder {
// `WindowBuilder::with_position` expects inner position in Macos, and outer position elsewhere
// See [`winit::window::WindowBuilder::with_position`] for details.
let pos_px = if cfg!(target_os = "macos") {
@@ -57,14 +60,16 @@ impl WindowSettings {
self.outer_position_pixels
};
if let Some(pos) = pos_px {
viewport_builder.with_position(Some(pos));
viewport_builder = viewport_builder.with_position(Some(pos));
}
if let Some(inner_size_points) = self.inner_size_points {
viewport_builder
viewport_builder = viewport_builder
.with_inner_size(Some(inner_size_points))
.with_fullscreen(self.fullscreen);
}
viewport_builder
}
pub fn initialize_window(&self, window: &winit::window::Window) {