Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 52 deletions

diff --git a/native/src/window/settings.rs b/native/src/window/settings.rs
deleted file mode 100644
index 67798fbe..00000000
--- a/native/src/window/settings.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::window::{Icon, Position};
-
-/// The window settings of an application.
-#[derive(Debug, Clone)]
-pub struct Settings {
-    /// The initial size of the window.
-    pub size: (u32, u32),
-
-    /// The initial position of the window.
-    pub position: Position,
-
-    /// The minimum size of the window.
-    pub min_size: Option<(u32, u32)>,
-
-    /// The maximum size of the window.
-    pub max_size: Option<(u32, u32)>,
-
-    /// Whether the window should be visible or not.
-    pub visible: bool,
-
-    /// Whether the window should be resizable or not.
-    pub resizable: bool,
-
-    /// Whether the window should have a border, a title bar, etc. or not.
-    pub decorations: bool,
-
-    /// Whether the window should be transparent.
-    pub transparent: bool,
-
-    /// Whether the window will always be on top of other windows.
-    pub always_on_top: bool,
-
-    /// The icon of the window.
-    pub icon: Option<Icon>,
-}
-
-impl Default for Settings {
-    fn default() -> Settings {
-        Settings {
-            size: (1024, 768),
-            position: Position::default(),
-            min_size: None,
-            max_size: None,
-            visible: true,
-            resizable: true,
-            decorations: true,
-            transparent: false,
-            always_on_top: false,
-            icon: None,
-        }
-    }
-}