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, 57 deletions

diff --git a/graphics/src/widget/canvas/text.rs b/graphics/src/widget/canvas/text.rs
deleted file mode 100644
index 056f8204..00000000
--- a/graphics/src/widget/canvas/text.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use crate::alignment;
-use crate::{Color, Font, Point};
-
-/// A bunch of text that can be drawn to a canvas
-#[derive(Debug, Clone)]
-pub struct Text {
-    /// The contents of the text
-    pub content: String,
-    /// The position of the text relative to the alignment properties.
-    /// By default, this position will be relative to the top-left corner coordinate meaning that
-    /// if the horizontal and vertical alignments are unchanged, this property will tell where the
-    /// top-left corner of the text should be placed.
-    /// By changing the horizontal_alignment and vertical_alignment properties, you are are able to
-    /// change what part of text is placed at this positions.
-    /// For example, when the horizontal_alignment and vertical_alignment are set to Center, the
-    /// center of the text will be placed at the given position NOT the top-left coordinate.
-    pub position: Point,
-    /// The color of the text
-    pub color: Color,
-    /// The size of the text
-    pub size: f32,
-    /// The font of the text
-    pub font: Font,
-    /// The horizontal alignment of the text
-    pub horizontal_alignment: alignment::Horizontal,
-    /// The vertical alignment of the text
-    pub vertical_alignment: alignment::Vertical,
-}
-
-impl Default for Text {
-    fn default() -> Text {
-        Text {
-            content: String::new(),
-            position: Point::ORIGIN,
-            color: Color::BLACK,
-            size: 16.0,
-            font: Font::Default,
-            horizontal_alignment: alignment::Horizontal::Left,
-            vertical_alignment: alignment::Vertical::Top,
-        }
-    }
-}
-
-impl From<String> for Text {
-    fn from(content: String) -> Text {
-        Text {
-            content,
-            ..Default::default()
-        }
-    }
-}
-
-impl From<&str> for Text {
-    fn from(content: &str) -> Text {
-        String::from(content).into()
-    }
-}