Add compat with libcosmic

Requires adding the libcosmic feature in Cargo.toml ``` cosmic-time = { version = 1.2.3, features = ["libcosmic"] } ```
pop-os · Jun 1, 2023 · 2ba3373 · 2ba3373
1 parent dbce137
commit 2ba3373
Show file tree

Hide file tree

Showing 17 changed files with 3,984 additions and 221 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,14 +10,19 @@ documentation = "https://docs.rs/cosmic-time"
 keywords = ["gui", "animation", "interface", "widgets", "iced"]
 categories = ["gui"]
 
+[features]
+default = ["iced", "iced_native", "iced_futures", "iced_core", "iced_style"]
+libcosmic = ["dep:libcosmic"]
+
 [workspace]
 members = [
     "examples/*",
 ]
 
 [dependencies]
-iced = { version = "0.9.0", features = [ "tokio" ] }
-iced_native = "0.10.1"
-iced_futures = "0.6.0"
-iced_core = "0.9.0"
-iced_style = "0.8.0"
+iced = { version = "0.9.0", features = [ "tokio" ], optional = true }
+iced_native = { version = "0.10.1", optional = true }
+iced_futures = { version = "0.6.0", optional = true }
+iced_core = { version = "0.9.0", optional = true }
+iced_style = { version = "0.8.0", optional = true }
+libcosmic = { path = "../libcosmic", optional = true }
diff --git a/src/keyframes.rs b/src/keyframes.rs
@@ -9,6 +9,9 @@ mod space;
 mod style_button;
 mod style_container;
 
+#[cfg(feature = "libcosmic")]
+use cosmic::iced_core::{widget, Length};
+#[cfg(not(feature = "libcosmic"))]
 use iced_native::{widget, Length};
 
 pub use button::Button;

diff --git a/src/keyframes/button.rs b/src/keyframes/button.rs
@@ -1,24 +1,32 @@
-use iced_native::{widget, Element, Length, Padding};
+#[cfg(feature = "libcosmic")]
+use cosmic::iced::widget;
+#[cfg(feature = "libcosmic")]
+use cosmic::iced_core::{widget::Id as IcedId, Element, Length, Padding, Renderer as IcedRenderer};
+
+#[cfg(not(feature = "libcosmic"))]
+use iced_native::{
+    widget, widget::Id as IcedId, Element, Length, Padding, Renderer as IcedRenderer,
+};
 
 use crate::keyframes::{as_f32, get_length, Repeat};
 use crate::timeline::Frame;
 use crate::{Ease, Linear, MovementType};
 
 /// A Button's animation Id. Used for linking animation built in `update()` with widget output in `view()`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Id(iced_native::widget::Id);
+pub struct Id(IcedId);
 
 impl Id {
     /// Creates a custom [`Id`].
     pub fn new(id: impl Into<std::borrow::Cow<'static, str>>) -> Self {
-        Self(widget::Id::new(id))
+        Self(IcedId::new(id))
     }
 
     /// Creates a unique [`Id`].
     ///
     /// This function produces a different [`Id`] every time it is called.
     pub fn unique() -> Self {
-        Self(widget::Id::unique())
+        Self(IcedId::unique())
     }
 
     /// Used by [`crate::chain!`] macro
@@ -38,14 +46,14 @@ impl Id {
         content: impl Into<Element<'a, Message, Renderer>>,
     ) -> widget::Button<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::button::StyleSheet,
     {
         Button::as_widget(self, timeline, content)
     }
 }
 
-impl From<Id> for widget::Id {
+impl From<Id> for IcedId {
     fn from(id: Id) -> Self {
         id.0
     }
@@ -147,10 +155,10 @@ impl Button {
         content: impl Into<Element<'a, Message, Renderer>>,
     ) -> widget::Button<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::button::StyleSheet,
     {
-        let id: widget::Id = id.into();
+        let id: IcedId = id.into();
 
         widget::Button::new(content)
             .width(get_length(&id, timeline, 0, Length::Shrink))

diff --git a/src/keyframes/column.rs b/src/keyframes/column.rs
@@ -1,24 +1,32 @@
-use iced_native::{widget, Length, Padding, Pixels};
+#[cfg(feature = "libcosmic")]
+use cosmic::iced::widget;
+#[cfg(feature = "libcosmic")]
+use cosmic::iced_core::{widget::Id as IcedId, Length, Padding, Pixels, Renderer as IcedRenderer};
+
+#[cfg(not(feature = "libcosmic"))]
+use iced_native::{
+    widget, widget::Id as IcedId, Length, Padding, Pixels, Renderer as IcedRenderer,
+};
 
 use crate::keyframes::{as_f32, get_length, Repeat};
 use crate::timeline::Frame;
 use crate::{Ease, Linear, MovementType};
 
 /// A Column's animation Id. Used for linking animation built in `update()` with widget output in `view()`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Id(iced_native::widget::Id);
+pub struct Id(IcedId);
 
 impl Id {
     /// Creates a custom [`Id`].
     pub fn new(id: impl Into<std::borrow::Cow<'static, str>>) -> Self {
-        Self(widget::Id::new(id))
+        Self(IcedId::new(id))
     }
 
     /// Creates a unique [`Id`].
     ///
     /// This function produces a different [`Id`] every time it is called.
     pub fn unique() -> Self {
-        Self(widget::Id::unique())
+        Self(IcedId::unique())
     }
 
     /// Used by [`crate::chain!`] macro
@@ -37,14 +45,14 @@ impl Id {
         timeline: &crate::Timeline,
     ) -> widget::Column<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::container::StyleSheet,
     {
         Column::as_widget(self, timeline)
     }
 }
 
-impl From<Id> for widget::Id {
+impl From<Id> for IcedId {
     fn from(id: Id) -> Self {
         id.0
     }
@@ -148,10 +156,10 @@ impl Column {
         timeline: &crate::Timeline,
     ) -> widget::Column<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::container::StyleSheet,
     {
-        let id: widget::Id = id.into();
+        let id: IcedId = id.into();
 
         widget::Column::new()
             .spacing(timeline.get(&id, 0).map(|m| m.value).unwrap_or(0.))

diff --git a/src/keyframes/container.rs b/src/keyframes/container.rs
@@ -1,24 +1,34 @@
-use iced_native::{widget, Element, Length, Padding, Pixels};
+#[cfg(feature = "libcosmic")]
+use cosmic::iced::widget;
+#[cfg(feature = "libcosmic")]
+use cosmic::iced_core::{
+    widget::Id as IcedId, Element, Length, Padding, Pixels, Renderer as IcedRenderer,
+};
+
+#[cfg(not(feature = "libcosmic"))]
+use iced_native::{
+    widget, widget::Id as IcedId, Element, Length, Padding, Pixels, Renderer as IcedRenderer,
+};
 
 use crate::keyframes::{as_f32, get_length, Repeat};
 use crate::timeline::Frame;
 use crate::{Ease, Linear, MovementType};
 
 /// A Container's animation Id. Used for linking animation built in `update()` with widget output in `view()`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Id(iced_native::widget::Id);
+pub struct Id(IcedId);
 
 impl Id {
     /// Creates a custom [`Id`].
     pub fn new(id: impl Into<std::borrow::Cow<'static, str>>) -> Self {
-        Self(widget::Id::new(id))
+        Self(IcedId::new(id))
     }
 
     /// Creates a unique [`Id`].
     ///
     /// This function produces a different [`Id`] every time it is called.
     pub fn unique() -> Self {
-        Self(widget::Id::unique())
+        Self(IcedId::unique())
     }
 
     /// Used by [`crate::chain!`] macro
@@ -38,14 +48,14 @@ impl Id {
         content: impl Into<Element<'a, Message, Renderer>>,
     ) -> widget::Container<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::container::StyleSheet,
     {
         Container::as_widget(self, timeline, content)
     }
 }
 
-impl From<Id> for widget::Id {
+impl From<Id> for IcedId {
     fn from(id: Id) -> Self {
         id.0
     }
@@ -153,10 +163,10 @@ impl Container {
         content: impl Into<Element<'a, Message, Renderer>>,
     ) -> widget::Container<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::container::StyleSheet,
     {
-        let id: widget::Id = id.into();
+        let id: IcedId = id.into();
 
         widget::Container::new(content)
             .width(get_length(&id, timeline, 0, Length::Shrink))

diff --git a/src/keyframes/row.rs b/src/keyframes/row.rs
@@ -1,24 +1,32 @@
-use iced_native::{widget, Length, Padding, Pixels};
+#[cfg(feature = "libcosmic")]
+use cosmic::iced::widget;
+#[cfg(feature = "libcosmic")]
+use cosmic::iced_core::{widget::Id as IcedId, Length, Padding, Pixels, Renderer as IcedRenderer};
+
+#[cfg(not(feature = "libcosmic"))]
+use iced_native::{
+    widget, widget::Id as IcedId, Length, Padding, Pixels, Renderer as IcedRenderer,
+};
 
 use crate::keyframes::{as_f32, get_length, Repeat};
 use crate::timeline::Frame;
 use crate::{Ease, Linear, MovementType};
 
 /// A Row's animation Id. Used for linking animation built in `update()` with widget output in `view()`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Id(iced_native::widget::Id);
+pub struct Id(IcedId);
 
 impl Id {
     /// Creates a custom [`Id`].
     pub fn new(id: impl Into<std::borrow::Cow<'static, str>>) -> Self {
-        Self(widget::Id::new(id))
+        Self(IcedId::new(id))
     }
 
     /// Creates a unique [`Id`].
     ///
     /// This function produces a different [`Id`] every time it is called.
     pub fn unique() -> Self {
-        Self(widget::Id::unique())
+        Self(IcedId::unique())
     }
 
     /// Used by [`crate::chain!`] macro
@@ -37,14 +45,14 @@ impl Id {
         timeline: &crate::Timeline,
     ) -> widget::Row<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::container::StyleSheet,
     {
         Row::as_widget(self, timeline)
     }
 }
 
-impl From<Id> for widget::Id {
+impl From<Id> for IcedId {
     fn from(id: Id) -> Self {
         id.0
     }
@@ -148,10 +156,10 @@ impl Row {
         timeline: &crate::Timeline,
     ) -> widget::Row<'a, Message, Renderer>
     where
-        Renderer: iced_native::Renderer,
+        Renderer: IcedRenderer,
         Renderer::Theme: widget::container::StyleSheet,
     {
-        let id: widget::Id = id.into();
+        let id: IcedId = id.into();
 
         widget::Row::new()
             .spacing(timeline.get(&id, 0).map(|m| m.value).unwrap_or(0.))

diff --git a/src/keyframes/space.rs b/src/keyframes/space.rs
@@ -1,24 +1,30 @@
-use iced_native::{widget, Length};
+#[cfg(feature = "libcosmic")]
+use cosmic::iced::widget;
+#[cfg(feature = "libcosmic")]
+use cosmic::iced_core::{widget::Id as IcedId, Length};
+
+#[cfg(not(feature = "libcosmic"))]
+use iced_native::{widget, widget::Id as IcedId, Length};
 
 use crate::keyframes::{as_f32, get_length, Repeat};
 use crate::timeline::Frame;
 use crate::{Ease, Linear, MovementType};
 
 /// A Space's animation Id. Used for linking animation built in `update()` with widget output in `view()`
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Id(iced_native::widget::Id);
+pub struct Id(IcedId);
 
 impl Id {
     /// Creates a custom [`Id`].
     pub fn new(id: impl Into<std::borrow::Cow<'static, str>>) -> Self {
-        Self(widget::Id::new(id))
+        Self(IcedId::new(id))
     }
 
     /// Creates a unique [`Id`].
     ///
     /// This function produces a different [`Id`] every time it is called.
     pub fn unique() -> Self {
-        Self(widget::Id::unique())
+        Self(IcedId::unique())
     }
 
     /// Used by [`crate::chain!`] macro
@@ -37,7 +43,7 @@ impl Id {
     }
 }
 
-impl From<Id> for widget::Id {
+impl From<Id> for IcedId {
     fn from(id: Id) -> Self {
         id.0
     }
@@ -131,7 +137,7 @@ impl Space {
     }
 
     pub fn as_widget(id: Id, timeline: &crate::Timeline) -> widget::Space {
-        let id: widget::Id = id.into();
+        let id: IcedId = id.into();
 
         widget::Space::new(
             get_length(&id, timeline, 0, Length::Shrink),