Merge pull request #1748 from iced-rs/feature/software-renderer

Software renderer, runtime renderer fallback, and core consolidation

3 files changed, 3 insertions, 4 deletions

diff --git a/style/src/lib.rs b/style/src/lib.rs
index 59eb1eb8..286ff9db 100644
--- a/style/src/lib.rs
+++ b/style/src/lib.rs
@@ -18,7 +18,7 @@
 #![deny(missing_docs, unused_results)]
 #![forbid(unsafe_code, rust_2018_idioms)]
 #![allow(clippy::inherent_to_string, clippy::type_complexity)]
-pub use iced_core::{Background, Color};
+pub use iced_core as core;
 
 pub mod application;
 pub mod button;
@@ -33,7 +33,6 @@ pub mod rule;
 pub mod scrollable;
 pub mod slider;
 pub mod svg;
-pub mod text;
 pub mod text_input;
 pub mod theme;
 pub mod toggler;
diff --git a/style/src/text.rs b/style/src/text.rs
index f31c2306..d5a16bef 100644
--- a/style/src/text.rs
+++ b/style/src/text.rs
@@ -1,5 +1,5 @@
 //! Change the appearance of text.
-use iced_core::Color;
+use crate::core::Color;
 
 /// The style sheet of some text.
 pub trait StyleSheet {
diff --git a/style/src/theme.rs b/style/src/theme.rs
index 4ba4facf..b507d096 100644
--- a/style/src/theme.rs
+++ b/style/src/theme.rs
@@ -8,6 +8,7 @@ use crate::application;
 use crate::button;
 use crate::checkbox;
 use crate::container;
+use crate::core::widget::text;
 use crate::menu;
 use crate::pane_grid;
 use crate::pick_list;
@@ -17,7 +18,6 @@ use crate::rule;
 use crate::scrollable;
 use crate::slider;
 use crate::svg;
-use crate::text;
 use crate::text_input;
 use crate::toggler;