diff options
Diffstat (limited to '')
| -rw-r--r-- | runtime/src/program.rs (renamed from native/src/program.rs) | 6 | ||||
| -rw-r--r-- | runtime/src/program/state.rs (renamed from native/src/program/state.rs) | 18 | 
2 files changed, 11 insertions, 13 deletions
| diff --git a/native/src/program.rs b/runtime/src/program.rs index 25cab332..44585cc5 100644 --- a/native/src/program.rs +++ b/runtime/src/program.rs @@ -1,6 +1,8 @@  //! Build interactive programs using The Elm Architecture. -use crate::text; -use crate::{Command, Element, Renderer}; +use crate::Command; + +use iced_core::text; +use iced_core::{Element, Renderer};  mod state; diff --git a/native/src/program/state.rs b/runtime/src/program/state.rs index 8ae1cacb..2fa9934d 100644 --- a/native/src/program/state.rs +++ b/runtime/src/program/state.rs @@ -1,9 +1,9 @@ -use crate::application; -use crate::event::{self, Event}; -use crate::mouse; -use crate::renderer; +use crate::core::event::{self, Event}; +use crate::core::mouse; +use crate::core::renderer; +use crate::core::{Clipboard, Point, Size};  use crate::user_interface::{self, UserInterface}; -use crate::{Clipboard, Command, Debug, Point, Program, Size}; +use crate::{Command, Debug, Program};  /// The execution state of a [`Program`]. It leverages caching, event  /// processing, and rendering primitive storage. @@ -22,7 +22,6 @@ where  impl<P> State<P>  where      P: Program + 'static, -    <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. @@ -91,7 +90,7 @@ where          bounds: Size,          cursor_position: Point,          renderer: &mut P::Renderer, -        theme: &<P::Renderer as crate::Renderer>::Theme, +        theme: &<P::Renderer as iced_core::Renderer>::Theme,          style: &renderer::Style,          clipboard: &mut dyn Clipboard,          debug: &mut Debug, @@ -182,10 +181,7 @@ fn build_user_interface<'a, P: Program>(      renderer: &mut P::Renderer,      size: Size,      debug: &mut Debug, -) -> UserInterface<'a, P::Message, P::Renderer> -where -    <P::Renderer as crate::Renderer>::Theme: application::StyleSheet, -{ +) -> UserInterface<'a, P::Message, P::Renderer> {      debug.view_started();      let view = program.view();      debug.view_finished(); | 
