summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--native/src/lib.rs1
-rw-r--r--native/src/program/state.rs6
-rw-r--r--native/src/user_interface.rs9
3 files changed, 10 insertions, 6 deletions
diff --git a/native/src/lib.rs b/native/src/lib.rs
index 948fdff0..2d0dd6ec 100644
--- a/native/src/lib.rs
+++ b/native/src/lib.rs
@@ -76,6 +76,7 @@ pub use iced_core::{
Rectangle, Size, Vector,
};
pub use iced_futures::{executor, futures};
+pub use iced_style::application;
pub use iced_style::theme;
#[doc(no_inline)]
diff --git a/native/src/program/state.rs b/native/src/program/state.rs
index 0c133484..c881a64f 100644
--- a/native/src/program/state.rs
+++ b/native/src/program/state.rs
@@ -1,5 +1,5 @@
+use crate::application;
use crate::mouse;
-use crate::theme;
use crate::user_interface::{self, UserInterface};
use crate::{Clipboard, Command, Debug, Event, Point, Program, Size};
@@ -20,7 +20,7 @@ where
impl<P> State<P>
where
P: Program + 'static,
- <P::Renderer as crate::Renderer>::Theme: theme::Definition,
+ <P::Renderer as crate::Renderer>::Theme: application::StyleSheet,
{
/// Creates a new [`State`] with the provided [`Program`], initializing its
/// primitive with the given logical bounds and renderer.
@@ -168,7 +168,7 @@ fn build_user_interface<'a, P: Program>(
debug: &mut Debug,
) -> UserInterface<'a, P::Message, P::Renderer>
where
- <P::Renderer as crate::Renderer>::Theme: theme::Definition,
+ <P::Renderer as crate::Renderer>::Theme: application::StyleSheet,
{
debug.view_started();
let view = program.view();
diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs
index c8496112..26850f0a 100644
--- a/native/src/user_interface.rs
+++ b/native/src/user_interface.rs
@@ -1,9 +1,9 @@
//! Implement your own event loop to drive a user interface.
+use crate::application;
use crate::event::{self, Event};
use crate::layout;
use crate::mouse;
use crate::renderer;
-use crate::theme::{self, Definition as _};
use crate::{Clipboard, Element, Layout, Point, Rectangle, Shell, Size};
/// A set of interactive graphical elements with a specific [`Layout`].
@@ -29,7 +29,7 @@ pub struct UserInterface<'a, Message, Renderer> {
impl<'a, Message, Renderer> UserInterface<'a, Message, Renderer>
where
Renderer: crate::Renderer,
- Renderer::Theme: theme::Definition,
+ Renderer::Theme: application::StyleSheet,
{
/// Builds a user interface for an [`Element`].
///
@@ -373,7 +373,10 @@ where
renderer,
theme,
&renderer::Style {
- text_color: theme.text_color(),
+ text_color: {
+ use application::StyleSheet;
+ theme.text_color()
+ },
},
Layout::new(&self.base),
base_cursor,