Improve window::Position API

This commit is contained in:
Héctor Ramón Jiménez 2021-07-21 18:59:24 +07:00
parent 6793a7e00d
commit 72b3bf95de
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
7 changed files with 121 additions and 16 deletions

33
src/window/position.rs Normal file
View file

@ -0,0 +1,33 @@
/// The position of a window in a given screen.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Position {
/// The platform-specific default position for a new window.
Default,
/// The window is completely centered on the screen.
Centered,
/// The window is positioned with specific coordinates: `(X, Y)`.
///
/// When the decorations of the window are enabled, Windows 10 will add some
/// invisible padding to the window. This padding gets included in the
/// position. So if you have decorations enabled and want the window to be
/// at (0, 0) you would have to set the position to
/// `(PADDING_X, PADDING_Y)`.
Specific(i32, i32),
}
impl Default for Position {
fn default() -> Self {
Self::Default
}
}
#[cfg(not(target_arch = "wasm32"))]
impl From<Position> for iced_winit::Position {
fn from(position: Position) -> Self {
match position {
Position::Default => Self::Default,
Position::Centered => Self::Centered,
Position::Specific(x, y) => Self::Specific(x, y),
}
}
}

View file

@ -1,4 +1,4 @@
use crate::window::Icon;
use crate::window::{Icon, Position};
/// The window settings of an application.
#[derive(Debug, Clone)]
@ -7,13 +7,7 @@ pub struct Settings {
pub size: (u32, u32),
/// The initial position of the window.
///
/// When the decorations of the window are enabled, Windows 10 will add some
/// invisible padding to the window. This padding gets included in the
/// position. So if you have decorations enabled and want the window to be
/// at (0, 0) you would have to set the position to
/// `(PADDING_X, PADDING_Y)`.
pub position: (i32, i32),
pub position: Position,
/// The minimum size of the window.
pub min_size: Option<(u32, u32)>,
@ -41,7 +35,7 @@ impl Default for Settings {
fn default() -> Settings {
Settings {
size: (1024, 768),
position: (100, 100),
position: Position::default(),
min_size: None,
max_size: None,
resizable: true,
@ -58,7 +52,7 @@ impl From<Settings> for iced_winit::settings::Window {
fn from(settings: Settings) -> Self {
Self {
size: settings.size,
position: settings.position,
position: iced_winit::Position::from(settings.position),
min_size: settings.min_size,
max_size: settings.max_size,
resizable: settings.resizable,