diff --git a/examples/shrink_grow_layout.rs b/examples/shrink_grow_layout.rs index 958be0c9c1365f1064b143dc87fe78d134988139..fa1be48bd559b877d68267a0bb1eabf63be54858 100644 --- a/examples/shrink_grow_layout.rs +++ b/examples/shrink_grow_layout.rs @@ -10,12 +10,12 @@ use bevy::{ DefaultPlugins, }; use kayak_core::{ - styles::{LayoutType, Style, StyleProp, Units, Edge}, + styles::{Edge, LayoutType, Style, StyleProp, Units}, OnLayout, }; use kayak_core::{Color, EventType, OnEvent}; use kayak_render_macros::use_state; -use kayak_ui::widgets::{App, Text, Window, Element}; +use kayak_ui::widgets::{App, Element, Text, Window}; use kayak_ui::{ bevy::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}, widgets::Button, diff --git a/kayak_core/src/layout.rs b/kayak_core/src/layout.rs index 492bfe38016ba3816e9b21dd49b5fd3ec671701a..2ad33a423c6bf53c9cdb5c6c1de756144e9bbc12 100644 --- a/kayak_core/src/layout.rs +++ b/kayak_core/src/layout.rs @@ -3,12 +3,12 @@ use crate::Index; pub use morphorm::GeometryChanged; /// A layout data sent to widgets on layout. -/// +/// /// Similar and interchangeable with [Rect] /// ``` /// use kayak_core::layout_cache::Rect; /// use kayak_core::Layout; -/// +/// /// let layout = Layout::default(); /// let rect : Rect = layout.into(); /// let layout : Layout = rect.into(); diff --git a/kayak_core/src/layout_dispatcher.rs b/kayak_core/src/layout_dispatcher.rs index bcbba9efcf8bf7628d373ea9a4f99626ec44b140..7c35b56061563d6956b1204b9cb6be7ab10382f7 100644 --- a/kayak_core/src/layout_dispatcher.rs +++ b/kayak_core/src/layout_dispatcher.rs @@ -1,5 +1,5 @@ use indexmap::IndexSet; -use morphorm::{Cache}; +use morphorm::Cache; use crate::{Index, KayakContext, KayakContextRef, LayoutEvent}; diff --git a/kayak_core/src/vec.rs b/kayak_core/src/vec.rs index 6e054fd24c08be5d4c8e063a8e1077266cba1178..b70767c6169f34d0b59acd40446550f45f4755b0 100644 --- a/kayak_core/src/vec.rs +++ b/kayak_core/src/vec.rs @@ -1,4 +1,7 @@ -use crate::{context_ref::KayakContextRef, styles::Style, Children, Index, OnEvent, Widget, WidgetProps, OnLayout}; +use crate::{ + context_ref::KayakContextRef, styles::Style, Children, Index, OnEvent, OnLayout, Widget, + WidgetProps, +}; /// Props used by the [`VecTracker`] widget #[derive(Default, Debug, PartialEq, Clone)] diff --git a/src/widgets/background.rs b/src/widgets/background.rs index b2b917fd2b5b0dbd15135bd8ad0754d594639b3a..3e9125306ab135244e0bfcaa8271bacbcf0b4b60 100644 --- a/src/widgets/background.rs +++ b/src/widgets/background.rs @@ -1,10 +1,10 @@ -use kayak_core::OnLayout; use crate::core::{ render_command::RenderCommand, rsx, styles::{Style, StyleProp}, widget, Children, Fragment, OnEvent, WidgetProps, }; +use kayak_core::OnLayout; /// Props used by the [`Background`] widget #[derive(WidgetProps, Default, Debug, PartialEq, Clone)] diff --git a/src/widgets/text_box.rs b/src/widgets/text_box.rs index ceee81f3535a27f37588a36f1afa9722e2131f23..f872d2ec0318624e27c48225a2951f4ca5f82fe6 100644 --- a/src/widgets/text_box.rs +++ b/src/widgets/text_box.rs @@ -50,7 +50,7 @@ impl WidgetProps for TextBoxProps { fn get_on_layout(&self) -> Option<OnLayout> { self.on_layout.clone() } - + fn get_focusable(&self) -> Option<bool> { Some(!self.disabled) }