diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs index ef6bcac86..8c0bfeb8c 100644 --- a/crates/eframe/src/native/epi_integration.rs +++ b/crates/eframe/src/native/epi_integration.rs @@ -126,10 +126,10 @@ pub fn window_builder( } if let Some(min_size) = *min_window_size { - window_builder = window_builder.with_min_inner_size(Some(min_size.to_pos2())); + window_builder = window_builder.with_min_inner_size(Some(min_size)); } if let Some(max_size) = *max_window_size { - window_builder = window_builder.with_max_inner_size(Some(max_size.to_pos2())); + window_builder = window_builder.with_max_inner_size(Some(max_size)); } window_builder = window_builder.with_drag_and_drop(*drag_and_drop_support); @@ -153,7 +153,7 @@ pub fn window_builder( if let Some(initial_window_size) = *initial_window_size { let initial_window_size = initial_window_size.at_most(largest_monitor_point_size(event_loop)); - window_builder = window_builder.with_inner_size(Some(initial_window_size.to_pos2())); + window_builder = window_builder.with_inner_size(Some(initial_window_size)); } *initial_window_size diff --git a/crates/egui-winit/src/window_settings.rs b/crates/egui-winit/src/window_settings.rs index 89c5ef749..ea34ba438 100644 --- a/crates/egui-winit/src/window_settings.rs +++ b/crates/egui-winit/src/window_settings.rs @@ -62,7 +62,7 @@ impl WindowSettings { if let Some(inner_size_points) = self.inner_size_points { window - .with_inner_size(Some(inner_size_points.to_pos2())) + .with_inner_size(Some(inner_size_points)) .with_fullscreen(self.fullscreen) } else { window diff --git a/crates/egui/src/viewport.rs b/crates/egui/src/viewport.rs index a00f3bbea..3eed7c3a1 100644 --- a/crates/egui/src/viewport.rs +++ b/crates/egui/src/viewport.rs @@ -1,6 +1,6 @@ use std::{fmt::Display, sync::Arc}; -use epaint::Pos2; +use epaint::{Pos2, Vec2}; use crate::{Context, Id}; @@ -64,7 +64,7 @@ pub struct ViewportBuilder { pub title: String, pub name: Option<(String, String)>, pub position: Option>, - pub inner_size: Option>, + pub inner_size: Option>, pub fullscreen: Option, pub maximized: Option, pub minimized: Option, @@ -77,8 +77,8 @@ pub struct ViewportBuilder { pub title_hidden: Option, pub titlebar_transparent: Option, pub fullsize_content_view: Option, - pub min_inner_size: Option>, - pub max_inner_size: Option>, + pub min_inner_size: Option>, + pub max_inner_size: Option>, pub drag_and_drop: Option, pub close_button: Option, @@ -95,7 +95,7 @@ impl ViewportBuilder { title: "Dummy egui viewport".into(), name: None, position: None, - inner_size: Some(Some(Pos2::new(300.0, 200.0))), + inner_size: Some(Some(Vec2::new(300.0, 200.0))), fullscreen: None, maximized: None, resizable: Some(true), @@ -216,19 +216,19 @@ impl ViewportBuilder { } /// Should be bigger then 0 - pub fn with_inner_size(mut self, value: Option) -> Self { + pub fn with_inner_size(mut self, value: Option) -> Self { self.inner_size = Some(value); self } /// Should be bigger then 0 - pub fn with_min_inner_size(mut self, value: Option) -> Self { + pub fn with_min_inner_size(mut self, value: Option) -> Self { self.min_inner_size = Some(value); self } /// Should be bigger then 0 - pub fn with_max_inner_size(mut self, value: Option) -> Self { + pub fn with_max_inner_size(mut self, value: Option) -> Self { self.max_inner_size = Some(value); self } @@ -283,14 +283,14 @@ pub enum ViewportCommand { OuterPosition(Pos2), /// Should be bigger then 0 - InnerSize(Pos2), + InnerSize(Vec2), /// Should be bigger then 0 - MinInnerSize(Option), + MinInnerSize(Option), /// Should be bigger then 0 - MaxInnerSize(Option), - ResizeIncrements(Option), + MaxInnerSize(Option), + ResizeIncrements(Option), /// Top, Bottom, Right, Left Resize(bool, bool, bool, bool),