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, 15 insertions, 14 deletions

diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs
index d39dd90c..af374a2f 100644
--- a/graphics/src/lib.rs
+++ b/graphics/src/lib.rs
@@ -20,7 +20,7 @@
 )]
 #![forbid(rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 mod antialiasing;
 mod error;
 mod primitive;
@@ -28,28 +28,29 @@ mod transformation;
 mod viewport;
 
 pub mod backend;
-pub mod font;
+pub mod color;
+pub mod compositor;
+pub mod damage;
 pub mod gradient;
-pub mod image;
-pub mod layer;
-pub mod overlay;
+pub mod mesh;
 pub mod renderer;
-pub mod triangle;
-pub mod widget;
-pub mod window;
+
+#[cfg(feature = "geometry")]
+pub mod geometry;
+
+#[cfg(feature = "image")]
+pub mod image;
 
 pub use antialiasing::Antialiasing;
 pub use backend::Backend;
+pub use compositor::Compositor;
+pub use damage::Damage;
 pub use error::Error;
 pub use gradient::Gradient;
-pub use layer::Layer;
+pub use mesh::Mesh;
 pub use primitive::Primitive;
 pub use renderer::Renderer;
 pub use transformation::Transformation;
 pub use viewport::Viewport;
-pub use window::compositor;
 
-pub use iced_native::alignment;
-pub use iced_native::{
-    Alignment, Background, Color, Font, Point, Rectangle, Size, Vector,
-};
+pub use iced_core as core;