diff options
author | 2022-05-26 19:02:15 +0200 | |
---|---|---|
committer | 2022-05-26 19:02:15 +0200 | |
commit | 7f3b7075db68a215f4331b4bfba1c8ddd1c4d7f3 (patch) | |
tree | fb616dc39053d3249829c8a31976a1fd569153e5 /src | |
parent | 3e8f4cdd138d3f927ce8a3ea451cbfcca52af0d9 (diff) | |
download | iced-7f3b7075db68a215f4331b4bfba1c8ddd1c4d7f3.tar.gz iced-7f3b7075db68a215f4331b4bfba1c8ddd1c4d7f3.tar.bz2 iced-7f3b7075db68a215f4331b4bfba1c8ddd1c4d7f3.zip |
Rename `theme::Definition` to `application::StyleSheet`
Diffstat (limited to '')
-rw-r--r-- | src/application.rs | 5 | ||||
-rw-r--r-- | src/lib.rs | 4 | ||||
-rw-r--r-- | src/pure.rs | 2 | ||||
-rw-r--r-- | src/pure/application.rs | 5 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/application.rs b/src/application.rs index 01571b56..b7c8cf9f 100644 --- a/src/application.rs +++ b/src/application.rs @@ -1,7 +1,8 @@ -use crate::theme; use crate::window; use crate::{Command, Element, Executor, Settings, Subscription}; +pub use iced_native::application::StyleSheet; + /// An interactive cross-platform application. /// /// This trait is the main entrypoint of Iced. Once implemented, you can run @@ -102,7 +103,7 @@ pub trait Application: Sized { type Message: std::fmt::Debug + Send; /// The theme of your [`Application`]. - type Theme: Default + theme::Definition; + type Theme: Default + StyleSheet; /// The data needed to initialize your [`Application`]. type Flags; @@ -174,18 +174,18 @@ #![doc( html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg" )] -#![deny(missing_docs)] +//#![deny(missing_docs)] #![deny(missing_debug_implementations)] #![deny(unused_results)] #![forbid(unsafe_code)] #![forbid(rust_2018_idioms)] #![cfg_attr(docsrs, feature(doc_cfg))] -mod application; mod element; mod error; mod result; mod sandbox; +pub mod application; pub mod clipboard; pub mod executor; pub mod keyboard; diff --git a/src/pure.rs b/src/pure.rs index b2b3ade7..1efacdf4 100644 --- a/src/pure.rs +++ b/src/pure.rs @@ -95,9 +95,9 @@ //! [the original widgets]: crate::widget //! [`button::State`]: crate::widget::button::State //! [impure `Application`]: crate::Application +pub mod application; pub mod widget; -mod application; mod sandbox; pub use application::Application; diff --git a/src/pure/application.rs b/src/pure/application.rs index 1306ab6c..4a7df13e 100644 --- a/src/pure/application.rs +++ b/src/pure/application.rs @@ -1,8 +1,9 @@ use crate::pure::{self, Pure}; -use crate::theme; use crate::window; use crate::{Command, Executor, Settings, Subscription}; +pub use iced_native::application::StyleSheet; + /// A pure version of [`Application`]. /// /// Unlike the impure version, the `view` method of this trait takes an @@ -23,7 +24,7 @@ pub trait Application: Sized { type Message: std::fmt::Debug + Send; /// The theme of your [`Application`]. - type Theme: Default + theme::Definition; + type Theme: Default + StyleSheet; /// The data needed to initialize your [`Application`]. type Flags; |